phil235 95959a76ef Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1 ...

Conflicts:
	code/modules/admin/verbs/randomverbs.dm

2016-05-07 12:33:06 +02:00

..

advance

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

_disease.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1

2016-05-07 12:33:06 +02:00

_MobProcs.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

anxiety.dm

…

appendicitis.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

beesease.dm

…

brainrot.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

cold9.dm

…

cold.dm

…

dna_spread.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

fake_gbs.dm

…

flu.dm

…

fluspanish.dm

- Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.

2015-07-04 01:46:50 +03:00

gbs.dm

Fixes a few more incurable diseases

2016-01-15 14:23:23 -05:00

magnitis.dm

Fixes a few more incurable diseases

2016-01-15 14:23:23 -05:00

pierrot_throat.dm

…

retrovirus.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

rhumba_beat.dm

…

transformation.dm

Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake

2016-04-30 15:34:17 +10:00

tuberculosis.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

wizarditis.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00