Commit Graph

18020 Commits

Author SHA1 Message Date
joep van der velden
74fa2e38e8 Now throws the correct tile. plating is undamaged. 2018-09-27 23:21:15 +02:00
Crazy Lemon
f87ba51d13 Merge pull request #9619 from variableundefined/BenFluffDressTake2
Benjaminfallout Fluff Item (Fixed)
2018-09-27 12:32:33 -07:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
variableundefined
8062affc68 Merge pull request #9541 from SamHPurp/blob-acts
Fixes blobs not deleting light fixtures
2018-09-27 21:30:06 +08:00
variableundefined
1a7461fab7 Actually fixes conflicts! 2018-09-27 17:39:28 +08:00
tigercat2000
d07bb85151 Merge pull request #9542 from Crazylemon64/elo_fluff
E.L.O.'s fluff item
2018-09-27 01:12:32 -07:00
Crazy Lemon
0dd1c2522f Merge pull request #9621 from variableundefined/NerfPlasmaMan
Avert plasmaman taking over Paradise with double firepower
2018-09-26 22:02:20 -07:00
Crazy Lemon
9f31ac09e3 Merge pull request #9591 from Birdtalon/beepers
Beepsky responds to disarming
2018-09-26 21:09:52 -07:00
variableundefined
7b64b99e21 No double gun anymore! 2018-09-27 11:52:22 +08:00
Crazy Lemon
084866c5ba Merge pull request #9557 from SamHPurp/spawn-in-hunter-tackles
Refactors Xeno Hunter tackle spawn
2018-09-26 17:34:04 -07:00
Crazy Lemon
904061637c Merge pull request #9555 from SamHPurp/kills-sleeps/spawns
Removes Sleeps/Spawns from Malf AI modules
2018-09-26 17:33:32 -07:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
Crazy Lemon
ad283ae489 Merge pull request #9586 from SamHPurp/synthetic-capitalisation
Synthetic grammar fix
2018-09-26 17:25:24 -07:00
Crazy Lemon
dc1cbdfd93 Merge pull request #9600 from variableundefined/GearSpawn
Fixes gear disappearing on lobby screen
2018-09-26 17:02:31 -07:00
Crazy Lemon
85576d04e3 Merge pull request #9587 from SamHPurp/nt-formal-fixes
Code improvement & Spelling fix on NT Formal Gear
2018-09-26 17:01:15 -07:00
Crazy Lemon
f863b792bd Merge pull request #9601 from variableundefined/DropLocation
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
Crazy Lemon
26a20f5f8a Merge pull request #9593 from Birdtalon/borgactions
Borg modules now respect actions
2018-09-26 16:50:17 -07:00
Crazy Lemon
908783c571 Merge pull request #9598 from DesolateG/adverbADVERB
Fixes #9561
2018-09-26 16:29:45 -07:00
Crazy Lemon
d3505ea9b9 Merge pull request #9543 from nicetoolbox/changeling-grab-fix
Fix changeling tentacle grab
2018-09-26 16:25:25 -07:00
Crazy Lemon
5c5a0b357c Merge pull request #9534 from DesolateG/reapwhatyousoy
Fixes #9532
2018-09-26 16:24:07 -07:00
Crazy Lemon
80d8017e0f Merge pull request #9610 from dapocalypse/BugFixes
Bug Fixes
2018-09-24 21:02:46 -07:00
Crazy Lemon
0f6cc01ae3 Merge pull request #9597 from Birdtalon/oneclick
Additional check for one-click-antag
2018-09-24 21:00:20 -07:00
Dedhia
f68cf60f58 Fixes #9607 2018-09-24 15:16:16 -07:00
variableundefined
7db5f03207 Fixes a woops 2018-09-24 19:01:12 +08:00
Gwydion Brain
556cf17916 Syntax Cleanup 2018-09-23 12:09:17 -07:00
Gwydion Brain
b34fed375d Makes Travis happy 2018-09-23 11:52:52 -07:00
variableundefined
a499b0fc68 Paving the path for a bigger inventory refactor 2018-09-23 22:26:10 +08:00
variableundefined
1820e9cb19 Fixes gear disappearing on lobby screen 2018-09-23 19:31:12 +08:00
Gwydion Brain
d5035e3128 Initial (Fails Travis) (But works!) 2018-09-23 03:27:09 -07:00
Desolate
948cf1a2e9 Check added to adverb conditions when whispering. 2018-09-22 16:19:04 -05:00
Birdtalon
ffe2b5f27a adds additional check for protected jobs in one-click-antag 2018-09-22 17:50:24 +01:00
Birdtalon
5e3f4b40db equipping and unequipping borg modules now adds and removes item actions 2018-09-21 19:46:50 +01:00
Birdtalon
224f5ca6fc adds disarm intent to beepsky's retaliate proc 2018-09-21 17:50:57 +01:00
Purpose
aceb7708ed fixes the fix 2018-09-20 23:47:26 +01:00
Purpose
5267ae7d4f grammar & code improvement 2018-09-20 23:32:18 +01:00
Purpose
da5524ddeb tiny fix 2018-09-20 23:04:51 +01:00
Birdtalon
ceb9d41769 lasertag ED-209 bots now get assigned correct names 2018-09-18 18:05:21 +01:00
Crazy Lemon
63509d8f06 Merge pull request #9390 from shazbot194/Lumi_screen
Lumi's custom face
2018-09-16 15:48:04 -07:00
nicetoolbox
385f290bc3 Clean up some grabs 2018-09-16 12:28:39 -07:00
nicetoolbox
ea8cebfd5e Fix human grabbedby not returning the grab 2018-09-16 12:14:01 -07:00
Purpose
4288e7f829 Refactors another spawn cooldown var 2018-09-16 12:12:36 +01:00
Purpose
1fa1949f8f performance 2018-09-16 11:12:56 +01:00
dandykong
41a9d8930e Update robotics.dm 2018-09-15 22:08:18 -05:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Crazy Lemon
657ea61c7d Merge pull request #9545 from DesolateG/mmiradiotech
MMI Radio Upgrade now has a tech origin
2018-09-15 16:45:44 -07:00
Desolate
c3f1dea262 MMI Radio Upgrade now has a tech origin 2018-09-15 07:42:04 -05:00
Crazylemon64
dadac2c755 E.L.O.'s fluff item 2018-09-14 19:37:27 -07:00
Crazy Lemon
85e35bcba9 Merge pull request #9484 from BottomQuarks/BottomQuark_Fluff_Item
Bottom quark fluff item
2018-09-14 18:14:16 -07:00
Purpose
de9b01400a remove light fixtures 2018-09-14 22:00:02 +01:00
Ty-Omaha
07f5971921 bodytemperature 2018-09-13 08:01:48 -04:00