Cheridan
7b94435e9c
Merge pull request #10924 from phil235/ProtolatheInsertFix
...
Fixes being able to insert sheets into the protolathe from a distance
2015-07-31 02:01:55 -05:00
Cheridan
5b7c29073d
Merge pull request #10872 from phil235/DisposalStuff
...
Some disposal fixes
2015-07-30 17:30:18 -05:00
Remie Richards
f212ac2502
Merge pull request #10877 from Miauw62/spiders
...
Some spider improvements
2015-07-30 20:08:32 +01:00
phil235
95be17923e
Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
...
Conflicts:
_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Jordie0608
1132344628
Rice hat by scones
2015-07-30 21:13:43 +10:00
Jordie
9d41569b0c
Merge pull request #10918 from Ikarrus/gangending
...
Adds Ending Cinematic for Gang Dominations
2015-07-30 20:49:39 +10:00
Remie Richards
aff1d90848
Merge pull request #10885 from KorPhaeron/blood
...
Slaughter Demon powers can now be used by any mob
2015-07-29 19:42:27 +01:00
phil235
e670cec521
Fixes being able to insert sheets into the protolathe from a distance (w/o telekinesis).
...
Removes some unnecessary icon_state stuff, plus moving busy = 0 to after the end of the insertion animation.
2015-07-29 20:31:11 +02:00
KorPhaeron
b521801ef9
Updated comment
2015-07-29 13:22:52 -05:00
KorPhaeron
bece4783ad
Last PoolOrNew
2015-07-29 13:21:27 -05:00
KorPhaeron
fdf186ad5a
More of the same
2015-07-29 13:20:51 -05:00
KorPhaeron
f91094c2a6
Define
2015-07-29 13:19:33 -05:00
phil235
4d69d3ced0
Merge pull request #10790 from Jordie0608/fixingthingslikewillsmithfixedthewildwest
...
Energy gun overlay fixes and icon reversions
2015-07-29 15:04:27 +02:00
Jordie
73fa75873c
Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
...
Memo update
2015-07-29 21:35:28 +10:00
Jordie0608
047b49f166
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-07-29 20:05:15 +10:00
Jordie
500fed3b88
Merge pull request #10895 from xxalpha/revert-10887-revert-10826-cyberplus
...
Revert "Revert "Removed anti-drop implant from NukeOps uplink.""
2015-07-29 18:21:12 +10:00
Jordie
77025043c8
Merge pull request #10880 from Fayrik/GotTooManyBranches
...
Reverts #10619 , Adds Logging and Context to Admin's Who Command
2015-07-29 18:05:54 +10:00
Jordie
c12149bacd
Merge pull request #10886 from optimumtact/patch-3
...
Add some logging to molotov
2015-07-29 17:55:01 +10:00
Jordie
217f967649
Merge pull request #10889 from phil235/LizardGenderFix
...
Fixes the lizard gender issue.
2015-07-29 17:48:00 +10:00
Jordie
f91a03232b
Merge pull request #10870 from AnturK/tunnelsnakesrule
...
Allows aliens to mine
2015-07-29 17:42:19 +10:00
Jordie
d841bb25b8
Merge pull request #10833 from Steelpoint/ERTDesc
...
[QOL] Expanded Admin Descriptions For ERT Deployment
2015-07-29 17:30:43 +10:00
Jordie
7f4b8e63da
Merge pull request #10841 from phil235/MobSwapFix
...
Changes mob swap to use Move().
2015-07-29 17:23:37 +10:00
Jordie
9229890aae
Merge pull request #10842 from lordpidey/lordpidey-new_chemicals
...
Added a new medication, Miner's Salve
2015-07-29 17:22:31 +10:00
Jordie
4cac66aa16
Merge pull request #10890 from GunHog/Borgie_Lights_And_Biscuits
...
Cooldown for Cyborg Headlamps
2015-07-29 17:15:49 +10:00
Jordie
adeb5f09cd
Merge pull request #10589 from Chiefwaffles/Obsolete_AI_2016
...
Adds the Automated Announcement System
2015-07-29 17:14:02 +10:00
Jordie0608
b2591e23a3
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-07-29 16:46:42 +10:00
Ikarrus
4aedc97e82
Adds Ending Cinematic for Gang Dominations
...
It basically flashes the SYSTEM OVERRIDE COMPLETE animation.
2015-07-28 20:21:52 -06:00
Jordie0608
f9b6dfcefe
login memo fix
2015-07-28 23:24:25 +10:00
Jordie0608
f7489b18af
memo update
2015-07-28 21:42:25 +10:00
Cheridan
24870ca952
Merge pull request #10878 from AnturK/slugfixes
...
Changeling Fixes
2015-07-27 18:49:38 -05:00
xxalpha
fc4afd763d
Revert "Revert "Removed anti-drop implant from NukeOps uplink.""
2015-07-27 18:47:56 +01:00
GunHog
159f35786d
Cooldown for Cyborg Headlamps
...
- Most causes of forced headlamp deactivation will turn them off for
either 10 seconds or the duration of the stun, whichever is longer.
- The Shadowling veil ability now shuts down a borg's headlamp for the
entire spell's cooldown.
2015-07-27 09:13:04 -05:00
phil235
dac815d698
Fixes the lizard gender issue.(updated version of SvartaSvansen's PR.
2015-07-27 15:30:06 +02:00
Thunder12345
84ef074312
Revert "Removed anti-drop implant from NukeOps uplink."
2015-07-27 11:10:32 +01:00
Swag McYolosteinen
b14f49efc5
Merge pull request #10826 from xxalpha/cyberplus
...
Removed anti-drop implant from NukeOps uplink.
2015-07-27 12:08:08 +02:00
Orange Borg
c013cb3508
Add some logging to molotov
...
Who primed molotov and the area of priming
2015-07-27 20:18:50 +12:00
KorPhaeron
76d012bec2
Should probably let the demon actually use its powers still
2015-07-26 23:03:15 -05:00
KorPhaeron
05bbc1724c
Forgot a file how terrible
2015-07-26 23:00:21 -05:00
KorPhaeron
9ca23ebdeb
Bloodcrawl
2015-07-26 23:00:06 -05:00
Fayrik
b67068b5c5
Who is cool again. Also, observers aren't ghosts. (And I hate pointless whitespace.)
2015-07-27 02:26:59 +01:00
AnturK
b018dd89fd
Fixes monkey lings not regenerating chems
2015-07-26 23:13:49 +02:00
AnturK
ca40f140b0
Fixes Last Resort not working sometimes
...
Cuts egg time by a third
2015-07-26 22:33:51 +02:00
Mike Long
101eae808d
Gave Miner's salve a slight side effect when ingested, to show that it's designed to be applied, not ingested.
...
Changed secondary recipe of Miner's Salve to be a sheet of iron+ a sheet of plasma + a twinkie in a grinder. That seems more "ghetto chemistry"
Added grinder to mining station.
2015-07-26 16:18:59 -04:00
Swag McYolosteinen
124599cd2c
Makes spider reagents work better
2015-07-26 22:14:50 +02:00
phil235
34b9a045fc
Fixes non carbon being stunned when thrown and hitting something dense.
...
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
AnturK
198758e52d
Feedback
2015-07-26 20:11:03 +02:00
AnturK
fa35ae91d7
Allows aliens to mine
2015-07-26 20:01:52 +02:00
Steelpoint
a3099df65a
WrongWord
2015-07-27 01:38:29 +08:00
Steelpoint
a5233a77d6
DescUpdate
2015-07-27 01:35:23 +08:00
phil235
c853ec49a9
Repathed disposal unit from machinery/disposal to machinery/disposal/bin. Moved some stuff around, split disposal.dm into disposal-structures.dm and disposal-unit.dm , the latter containing both disposal bin and delivery chute.
2015-07-26 16:20:21 +02:00
