decf5495cb
Removed unnecessary braces.
2015-07-30 18:09:33 -04:00
7ead988517
Teach those lizards some manners!
2015-07-30 17:14:42 -04:00
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
b521801ef9
Updated comment
2015-07-29 13:22:52 -05:00
bece4783ad
Last PoolOrNew
2015-07-29 13:21:27 -05:00
fdf186ad5a
More of the same
2015-07-29 13:20:51 -05:00
f91094c2a6
Define
2015-07-29 13:19:33 -05:00
4d69d3ced0
Merge pull request #10790 from Jordie0608/fixingthingslikewillsmithfixedthewildwest
...
Energy gun overlay fixes and icon reversions
2015-07-29 15:04:27 +02:00
73fa75873c
Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
...
Memo update
2015-07-29 21:35:28 +10:00
047b49f166
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-07-29 20:05:15 +10:00
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
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
c12149bacd
Merge pull request #10886 from optimumtact/patch-3
...
Add some logging to molotov
2015-07-29 17:55:01 +10:00
217f967649
Merge pull request #10889 from phil235/LizardGenderFix
...
Fixes the lizard gender issue.
2015-07-29 17:48:00 +10:00
f91a03232b
Merge pull request #10870 from AnturK/tunnelsnakesrule
...
Allows aliens to mine
2015-07-29 17:42:19 +10:00
d841bb25b8
Merge pull request #10833 from Steelpoint/ERTDesc
...
[QOL] Expanded Admin Descriptions For ERT Deployment
2015-07-29 17:30:43 +10:00
7f4b8e63da
Merge pull request #10841 from phil235/MobSwapFix
...
Changes mob swap to use Move().
2015-07-29 17:23:37 +10:00
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
4cac66aa16
Merge pull request #10890 from GunHog/Borgie_Lights_And_Biscuits
...
Cooldown for Cyborg Headlamps
2015-07-29 17:15:49 +10:00
adeb5f09cd
Merge pull request #10589 from Chiefwaffles/Obsolete_AI_2016
...
Adds the Automated Announcement System
2015-07-29 17:14:02 +10:00
b2591e23a3
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-07-29 16:46:42 +10:00
f9b6dfcefe
login memo fix
2015-07-28 23:24:25 +10:00
f7489b18af
memo update
2015-07-28 21:42:25 +10:00
24870ca952
Merge pull request #10878 from AnturK/slugfixes
...
Changeling Fixes
2015-07-27 18:49:38 -05:00
fc4afd763d
Revert "Revert "Removed anti-drop implant from NukeOps uplink.""
2015-07-27 18:47:56 +01:00
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
dac815d698
Fixes the lizard gender issue.(updated version of SvartaSvansen's PR.
2015-07-27 15:30:06 +02:00
84ef074312
Revert "Removed anti-drop implant from NukeOps uplink."
2015-07-27 11:10:32 +01:00
b14f49efc5
Merge pull request #10826 from xxalpha/cyberplus
...
Removed anti-drop implant from NukeOps uplink.
2015-07-27 12:08:08 +02:00
c013cb3508
Add some logging to molotov
...
Who primed molotov and the area of priming
2015-07-27 20:18:50 +12:00
76d012bec2
Should probably let the demon actually use its powers still
2015-07-26 23:03:15 -05:00
05bbc1724c
Forgot a file how terrible
2015-07-26 23:00:21 -05:00
9ca23ebdeb
Bloodcrawl
2015-07-26 23:00:06 -05:00
b67068b5c5
Who is cool again. Also, observers aren't ghosts. (And I hate pointless whitespace.)
2015-07-27 02:26:59 +01:00
b018dd89fd
Fixes monkey lings not regenerating chems
2015-07-26 23:13:49 +02:00
ca40f140b0
Fixes Last Resort not working sometimes
...
Cuts egg time by a third
2015-07-26 22:33:51 +02:00
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
198758e52d
Feedback
2015-07-26 20:11:03 +02:00
fa35ae91d7
Allows aliens to mine
2015-07-26 20:01:52 +02:00
a3099df65a
WrongWord
2015-07-27 01:38:29 +08:00
a5233a77d6
DescUpdate
2015-07-27 01:35:23 +08:00
b48eab3c43
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixingthingslikewillsmithfixedthewildwest
...
Conflicts:
icons/obj/guns/energy.dmi
2015-07-26 18:29:51 +10:00
1c59a84660
Dumb byond stuff fixed and merge conflict fixed for the gazillionth time.
2015-07-25 16:19:21 -07:00
8e97d19546
Merge pull request #10811 from Incoming5643/Take_a_number
...
Clears up define troubles for human/carbon mobs
2015-07-25 15:02:04 +02:00
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
0034e5a8f3
Merge pull request #10802 from bgobandit/monkeyrecyclingfix
...
Monkey recycler message now changes to reflect part upgrades.
2015-07-25 19:47:48 +10:00
9fbabcc305
Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe
...
Change many ERROR() calls into thrown exceptions
2015-07-25 19:22:46 +10:00
3fefa5f6fa
Merge pull request #10793 from bgobandit/thewaggening
...
Non-mutant humans can no longer wag their tails.
2015-07-25 19:11:50 +10:00
6e60aa2f08
Merge pull request #10791 from phil235/BeakerFeedingFix
...
Fixes beaker feeding
2015-07-25 19:11:21 +10:00
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +10:00
SvartaSvansen
Remie Richards
KorPhaeron
phil235
Jordie
Cheridan
xxalpha
GunHog
phil235
Thunder12345
Swag McYolosteinen
Orange Borg
Fayrik
AnturK
Mike Long
Steelpoint
Chiefwaffles