Commit Graph

3999 Commits

Author SHA1 Message Date
Jordan Brown d73810f9f1 IED code cleanup (#28318) 2017-06-11 22:47:30 -03:00
Leo 93f1e1b605 Merge pull request #28331 from QualityVan/lighters
Lighters need to be on
2017-06-11 22:44:08 -03:00
Ashe Higgs 33329e50b5 Fixes IED sprites inheriting their can's offsets (#28317) 2017-06-11 18:28:22 -04:00
Lzimann 3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
QualityVan c18f68df6d Lighters need to be on 2017-06-10 22:06:35 -04:00
ShizCalev eb9f0baeec Makes RADIMMUNE species incompatible with radiation based DNA injectors (#28246)
* dna injector

* why the fuck is my git client doing this
2017-06-10 19:19:12 +02:00
Mike Long 8e07021c0d Adds F.R.A.M.E. cartridge (#28113)
* Refactors old PDA virus cart code

* Adds F.R.A.M.E. cartridge

* Adds FRAME to uplink

* FRAME can now be used to push telecrystals to the target.

* Makes cartridges more extensible.

* Fixes compilation

* Fixes exploit involving removing target's TC if used multiple times.

* Removes redundant var, in accordance with convention.

* Things actually work now.  Whoops.
2017-06-10 19:17:33 +02:00
Joan Lung 7ec67bc960 Merge pull request #28202 from Tacolizard/medalmemesv2ultra
Gives the RD and HoS medal lockboxes
2017-06-08 21:36:06 -04:00
ShizCalev f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Tacolizard 5ea7095875 remake 2017-06-08 12:35:32 -07:00
Jordan Brown f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Joan Lung 81ae23ace9 Merge pull request #28189 from Xhuis/defib_paddle_fix
Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
2017-06-08 11:57:30 -04:00
Jordan Brown 5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Leo 48649596e2 Merge pull request #28150 from ShizCalev/ce-belt
Fixes CE's hand drill changing size
2017-06-07 16:14:08 -03:00
Xhuis 60073e279e Removes NODROP from defibrillator paddles 2017-06-07 12:01:06 -04:00
Leo 4f3d720c93 Merge pull request #28124 from Shadowlight213/whywasthisevenadded
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-07 11:07:13 -03:00
Expletive 8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
swindly b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03:00
shizcalev eb3756b8eb fixed
fixes #28120
fixes #28136
2017-06-06 15:36:25 -04:00
Jordan Brown ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Shadowlight213 0150de51c3 Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones 2017-06-05 20:58:12 -07:00
Joan Lung 5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
InsaneHyena 5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Joan Lung d5e608807f Only human and silicon servants can help recite multi-invoker scriptures (#28049) 2017-06-04 21:22:55 -03:00
Leo 477bd09609 Merge pull request #27948 from swindly/grenade_buff
Buffs chemical grenades
2017-06-03 23:38:51 -03:00
Expletive 73d65ceb82 The Crafting Menu now has subcategories! (#27863)
* subcategories also it's broken

* It works!

* Fix pneumatic cannon recipe

* Some fixes and changes

* Reformats ui, removes redundant chat messages

* Remove comment

* while im at it
2017-06-03 19:28:14 +02:00
oranges 0979a24e07 Merge pull request #27932 from octareenroon91/patch-48
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 23:41:28 +12:00
Leo c84b6f2a9b Merge pull request #27922 from QualityVan/tacticoolwebbing
Makes op belts less brown
2017-06-01 22:31:24 -03:00
Steelpoint 901d762d1e Marine ID Access Change (#27907) 2017-06-01 17:29:13 -03:00
swindly c8b8eec88b buffs chem grenades 2017-06-01 15:28:21 -04:00
octareenroon91 4012ce0aa7 Update storage.dm 2017-06-01 00:24:26 -05:00
QualityVan aff5e45e55 Makes op belts less brown 2017-05-31 20:40:15 -04:00
Expletive 2b298bb6aa Adds The NT-75 Electromagnetic Power Inducer (#27653) 2017-05-31 14:59:13 -03:00
Leo 69f6cc7f96 Merge pull request #27866 from AnturK/something-i-remembered
Makes VV'ing ID cards easier.
2017-05-31 10:48:43 -03:00
AnturK 79af94382a Flamethrower fixes (#27846) 2017-05-30 13:54:56 -06:00
AnturK ae710055cc Makes VV'ing ID cards easier. 2017-05-30 13:21:34 +02:00
Tacolizard 334997133d Update tank_types.dm (#27769) 2017-05-29 10:07:08 -06:00
AnturK 19192fd4ca Removes dragoontomb ruin and loot. (#27799) 2017-05-29 10:04:29 -06:00
Joan Lung ac4da32733 Splits mining_mobs.dm into separate files (#27773)
* Splits mining_mobs.dm into separate files

* find/replace
2017-05-29 02:16:26 -04:00
Jordan Brown 1abfc03f88 Merge branch 'master' into goonchatv3 2017-05-28 16:30:33 -04:00
Steelpoint 03b31490dd [Lavaland Ruin] Crashed Marine Transport (#27660)
* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk
2017-05-28 10:30:17 -04:00
AnturK 26be9d20e7 Fixes captain's spare access. (#27788) 2017-05-28 10:10:40 -04:00
Joan Lung 9275ec2327 Merge pull request #27750 from kevinz000/patch-189
Fixes clown creampie cannon not recharging properly
2017-05-28 09:17:08 -04:00
Expletive b13ac48065 Vapes are tiny (#27689) 2017-05-27 11:48:20 -04:00
Expletive 185235dc15 Port vapes to Initialize() (#27688) 2017-05-27 10:21:10 -03:00
AnturK cf5618e31e ID card mapping aid (#27690) 2017-05-27 10:20:20 -03:00
kevinz000 feb4bd1c45 Update pneumaticCannon.dm 2017-05-27 01:21:33 -07:00
Leo 08777c4958 Merge pull request #27684 from ClosingBracket/change-explorer-webbing
Allows explorer webbings to hold marker beacons
2017-05-27 01:53:22 -03:00
Leo ab1999e026 Merge pull request #27681 from Cyberboss/GunInit
Ports guns to Initialize
2017-05-26 21:05:55 -03:00
Leo 6105e865e2 Merge pull request #27680 from Cyberboss/patch-101
Ports stunbatons to Initialize
2017-05-26 20:02:35 -03:00