Commit Graph

10293 Commits

Author SHA1 Message Date
KorPhaeron
593e9a1d7b Check for null input 2015-08-05 20:26:11 -05:00
KorPhaeron
e37efcc9c8 Ancient code 2015-08-05 20:19:25 -05:00
KorPhaeron
e714ecebcd Removes nonfunctional bolding 2015-08-05 20:14:54 -05:00
KorPhaeron
e28a0857b2 More efficient disguising 2015-08-05 20:14:22 -05:00
KorPhaeron
5612860c94 I can't spell 2015-08-05 14:51:43 -05:00
KorPhaeron
edf99daf4d New Guardian Type and fixes
Bomb type that sets booby traps.

Various value tweaks, bug fix, death messages.
2015-08-05 13:50:51 -05:00
KorPhaeron
50a5877646 Another update
Fixed the bluespace one telporting APCs around, added sprites for the
ghost version, fixed naming.
2015-08-05 03:13:57 -05:00
KorPhaeron
69d758f897 Merge branch 'korsbizzareadventure' of https://github.com/KorPhaeron/kortg into korsbizzareadventure 2015-08-04 20:00:59 -05:00
KorPhaeron
a82d9c5a0f More updates
Punching variant can choose battlecry, removed ventcrawl from scout
(weird interactions with incorporeal move), added an explosive act.
2015-08-04 20:00:45 -05:00
KorPhaeron
41b940c1fa Clarified var names 2015-08-03 23:52:35 -05:00
KorPhaeron
54fa4d8044 Update 2015-08-03 23:17:21 -05:00
KorPhaeron
3419ffb579 Spirits, nanomachines, scarabs 2015-08-03 17:52:05 -05: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
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