Commit Graph

1688 Commits

Author SHA1 Message Date
Remie Richards c19f72123c Merge pull request #11227 from phil235/EpilepsyFix
Fixes epilepsy mutation leaving you always at super high jitteriness level.
2015-08-18 20:31:23 +01:00
Remie Richards ea84d4f3ce Merge pull request #11207 from SconesC/belts
Adds Military Belts to the standard Uplink
2015-08-18 20:27:58 +01:00
phil235 5539689f3a Merge pull request #11043 from KorPhaeron/moreweebshit
Timestop for Wizards
2015-08-16 11:04:47 +02:00
phil235 8a4f8a4482 Revert "Adds 15-force edaggers that look and function like pens when off." 2015-08-16 00:36:08 +02:00
phil235 dacf037cda Fixes epilepsy mutation leaving you always at super high jitteriness level. The jitteriness goes way down after the epileptic seizure ends (similar to door shocking jitter). 2015-08-15 23:17:46 +02:00
phil235 df758d2fff Merge pull request #11146 from MMMiracles/biomemes
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
phil235 907031df61 Merge pull request #11202 from Miauw62/alanedaggerpoe
Adds 15-force edaggers that look and function like pens when off.
2015-08-15 16:16:30 +02:00
SconesC 024c71553a Reduces price to 3 TC 2015-08-14 15:32:07 -07:00
SconesC 138610b2a9 Belts into the Uplink 2015-08-14 15:23:30 -07:00
phil235 cb7bf7053b Merge pull request #10923 from Miauw62/neonewling
upgrades changeling disguises
2015-08-15 00:03:06 +02:00
Miauw 37dc7e0e3c Adds 15-force edaggers that look and function like pens when off. 2015-08-14 14:07:10 +02:00
Swag McYolosteinen 46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
Miauw 8859801ef2 Merge branch 'master' of https://github.com/tgstation/-tg-station into neonewling
Conflicts:
	code/game/gamemodes/changeling/powers/humanform.dm
2015-08-13 12:14:52 +02:00
Cheridan 720ffcc862 Merge pull request #11073 from RemieRichards/WireModernisation
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
Remie Richards eedea4d281 Merge pull request #11018 from Core0verload/hammerspace
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
MMMiracles 35b78b1209 Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery). 2015-08-11 01:56:38 -04:00
Miauw ad1da7c157 Removes tape recorder wires to fix a server-crashing bug. 2015-08-10 14:00:05 +02:00
phil235 e3400c0fc8 Fixes brainrot being incurable. 2015-08-08 11:42:44 +02:00
Jordie 133f3ee433 Merge pull request #10944 from bustygoku/Carrier-RNG
Removes Virus Carrier RNG
2015-08-07 19:36:29 +10:00
Remie Richards 4870122858 Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
c0 691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03:00
KorPhaeron 3e66d9daa8 Added cooldown_min 2015-08-05 18:01:19 -05:00
KorPhaeron 6a71cd2f57 Toki Wo Tomare
ZA WARUDO
2015-08-05 15:54:41 -05:00
bustygoku 9249edde12 Changelog And Line Deletions 2015-08-05 13:06:10 -07:00
Cheridan cd2faf72b5 Merge pull request #10988 from PatchouliKnowledge/Appendifixis
Fixes appendicitis magically self-curing
2015-08-05 05:38:46 -05:00
oranges 5c3a311dd4 Merge remote-tracking branch 'upstream/master' into Appendifixis
Conflicts:
	code/modules/surgery/appendectomy.dm
2015-08-05 13:58:21 +12:00
PatchouliKnowledge de8c10e6c7 Merge conflicts pls go 2015-08-05 01:08:52 +03:00
Xhuis e370d89ca3 Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-04 14:48:35 -04:00
c0 bd8d70ec26 New traitor item: storage implant 2015-08-04 18:28:38 +03:00
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
Xhuis d1ceb296be Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-03 16:37:06 -04:00
Xhuis 4cefd114c5 Shadowling update 3 2015-08-03 16:35:42 -04:00
c0 667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
PatchouliKnowledge 056c018b80 Preventative appendectomy prevents appendicitis 2015-08-03 15:13:00 +03:00
c0 600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
PatchouliKnowledge aabf11bd41 The one digit fix 2015-08-02 22:05:45 +03:00
PatchouliKnowledge f25e808def Fixes appendicitis magically self-curing 2015-08-02 21:30:11 +03:00
Cheridan 31fca2d6b8 Merge pull request #10952 from phil235/BartenderSecPhotoFix
Fixes bartender uniform not appearing in security record photo.
2015-08-02 07:20:45 -05:00
Miauw 865f4aacc9 New enhanced changeling transform actually works! Somewhat! 2015-08-01 18:14:43 +02:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
Miauw e333137e05 makes new ling transform compile. not sure if it works, though. 2015-07-31 19:01:25 +02:00
phil235 13e561e3e8 Fixes bartender uniform not appearing in security record photo.
Removing bar_suit icon in uniforms.dmi because it's identical to "barman"
Replaced instances of "ba_suit" and "bar_suit" with "barman" (so that the bartender uniform icon names follow the same pattern as other job uniforms ("chef", "captain", "hos", ...)
2015-07-31 16:20:21 +02:00
bustygoku ed08ce018f Removes Virus Carrier RNG 2015-07-30 19:44:18 -07:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
Jordie d01953e2a6 Merge pull request #10916 from Shadowlight213/VVirusfix
Fixes the DNA Spread virus not transforming victims when spread from those who were already transformed
2015-07-30 20:45:45 +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 080693262a Merge pull request #10861 from bgobandit/nobodycanintocarp
Adds more feedback to traitor dehydrated space carp. Fixes spelling.
2015-07-29 17:20:44 +10:00
palpatine213 70f2029666 Adds Transform to the skipped vars list 2015-07-28 18:25:38 -07:00
xxalpha 3e1199f51e Remove nutriment implant from uplink
description
2015-07-27 19:10:13 +01:00
xxalpha fc4afd763d Revert "Revert "Removed anti-drop implant from NukeOps uplink."" 2015-07-27 18:47:56 +01:00