Commit Graph

13853 Commits

Author SHA1 Message Date
Bjorn Neergaard 4fe38b328b Have air alarms support all gasses 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
xxalpha 9a9aaabb8d Removed bot/Emag() proc. Silicons can't interface with human emagged bots. 2016-01-18 19:12:19 +00:00
xxalpha 577488e0d8 safepick
more safepick
2016-01-18 05:46:44 +00:00
Shadowlight213 6e544beb82 Fixes the Reset player OOC color verb not working 2016-01-17 21:05:32 -08:00
KorPhaeron 76ac836350 Law Fix 2016-01-17 22:17:38 -06:00
KorPhaeron 35b8a253e7 AI Fix 2016-01-17 21:33:23 -06:00
xxalpha 8a669c93db Changed aimodule code to use laws datum instead of AI mob. 2016-01-18 03:08:41 +00:00
tkdrg 4e0e763cff Merge pull request #14677 from Buggy123/patch-8
Reflectors now give back the materials used to construct it when deconstructed.
2016-01-17 22:01:21 -03:00
xxalpha af7059e1f3 Divide beach coast icon into two. 2016-01-17 23:26:43 +00:00
xxalpha 53b74da4bd Fixes the straightjacket
More straightfixes
2016-01-17 22:12:34 +00:00
tkdrg 4de5320c5a Merge pull request #14674 from Buggy123/patch-7
Reinforced floors no longer burn away under extremely high temperatures.
2016-01-17 18:47:03 -03:00
tkdrg 4d3b4d8e47 Merge pull request #14684 from Buggy123/patch-11
Adds detonation tracking to grenades.
2016-01-17 18:31:27 -03:00
tkdrg 9212e0027a Merge pull request #14673 from Razharas/MalfFix
Fixes malf turret cover abuse
2016-01-17 18:18:55 -03:00
Buggy123 4da17c198b Never 2016-01-17 16:07:20 -05:00
Razharas c2730f6340 Grammar fix
Grammar fix
2016-01-17 23:33:36 +03:00
tkdrg fa8cc5cd12 Merge pull request #14669 from xxalpha/shingles
Objects under rwindows don't break.
2016-01-17 17:30:57 -03:00
xxalpha 6d56fafa1c fasdasdjaidfhasiufh
conflix

fuck that

mistake

Clearer if
2016-01-17 20:14:02 +00:00
Buggy123 84ba5cad1f Added tracking for who last touched the grenade, and corrected grammar. 2016-01-17 14:44:39 -05:00
tkdrg 4ed6ea1431 Merge pull request #14668 from nullstation/machinery_interact
Modify attack_hand for machinery to call the interact proc upon a suc…
2016-01-17 15:21:15 -03:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Razharas ad1c333e89 Fixes bible producing unlimited stuff
Fixes bible producing unlimited stuff
Fixes https://github.com/tgstation/-tg-station/issues/11298
2016-01-17 20:04:26 +03:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
duncathan salt 9fdbc32512 Merge pull request #14663 from Razharas/TurretFix
Makes turrets shoot rollerbedded things
2016-01-17 10:10:43 -06:00
xxalpha 61b66f7272 Fixed airlock lights turning on when airlock is unpowered. 2016-01-17 15:07:49 +00:00
Razharas 28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps
Generalized CanAStarPass() to all /obj
2016-01-17 15:33:39 +03:00
NullQuery 4a78a3f4f2 2 changes:
- Remove duplicate add_fingerprint
- Apply fix suggested by neersighted
2016-01-17 11:52:03 +01:00
Buggy123 bf45d4c1e2 Blobbernnauts can now see in the dark. 2016-01-16 22:06:25 -05:00
Buggy123 bed2037840 Adds detonation tracking to grenades. 2016-01-16 21:58:20 -05:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Buggy123 c3257ff8fb Corrected syntax error 2016-01-16 18:19:06 -05:00
Buggy123 01cb4cb340 Reflectors now give back the materials used to construct it when deconstructed. 2016-01-16 18:12:40 -05:00
Buggy123 87c82007f2 Uses infinity instead of a really large number. 2016-01-16 17:19:11 -05:00
Buggy123 3b4c7003a2 Reinforced floors no longer burn away under extremely high temperatures. 2016-01-16 16:25:11 -05:00
Razharas b8cde5c6cb Fixes malf turret cover abuse
Fixes malf turret cover abuse
Fixes https://github.com/tgstation/-tg-station/issues/7617
2016-01-16 22:53:39 +03:00
Razharas 1b008f874c Forgot some parentseses
Forgot some parentseses
2016-01-16 22:39:17 +03:00
bear1ake 760fc8a5aa Merge remote-tracking branch 'refs/remotes/tgstation/master' into some-fixes
# Conflicts:
#	code/ATMOSPHERICS/components/trinary_devices/filter.dm
2016-01-17 03:44:04 +09:00
xxalpha e4150ac88e Merge remote-tracking branch 'upstream/master' into shingles 2016-01-16 18:37:40 +00:00
xxalpha 6ff3817a89 Repath windows (oh god), nerf normal windows ex_act. 2016-01-16 18:27:16 +00:00
Bjorn Neergaard b95a58c8fb Repath canisters; make label code create a new can; use es6 function shorthand
By making a new canister when relabeled, we can make the name/desc identical to a
mapped canister, and remove hacky snowflake code
2016-01-16 12:13:51 -06:00
NullQuery c07bde77be Default implementation of interact to call ui_interact. 2016-01-16 18:53:45 +01:00
NullQuery c1cab5f74d Modify attack_hand for machinery to call the interact proc upon a successful click. 2016-01-16 18:45:52 +01:00
xxalpha 2cc55c3ba0 Changed floor ex_act to not break grilles & src if under r-windows. 2016-01-16 17:43:33 +00:00
NullQuery ea90109cea Directions have been given on how to proceed.
Underestimated the code style of this branch.
Now I've fixed it.
Clearly I was mistaken.
Forgive my mistakes.
Once upon a time...
Really, a long time ago.
Certain decisions were made.
Everyone agreed at the time.
Some didn't.
Maybe we could change the standard.
Eh, let's not.
2016-01-16 17:50:25 +01:00
Razharas f0aa442dc7 Makes turrets shoot rollerbedded things
Makes turrets shoot rollerbedded things fixes #6168
2016-01-16 18:58:44 +03:00
NullQuery 75652783ae Remove unnecessary comment in favor of Git blame feature.
Fixes #14599
2016-01-16 16:13:50 +01:00
Aranclanos ef12dc0ea5 Merge pull request #14635 from Razharas/SHutterFix
Fixes c4 not working on shutters
2016-01-16 11:54:25 -03:00
Menshin 828c1ddf2c * Generalized AStar check for objects preventing passability
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616)
2016-01-16 15:27:31 +01:00
NullQuery 618372a111 Call check_shields when attacked by an abductor baton. 2016-01-16 11:28:06 +01:00