MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel ...

Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm

2014-03-02 21:39:27 -08:00

..

advance

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

2014-03-02 21:39:27 -08:00

appendicitis.dm

Commiting some soft Updates of commits I'm behind on and Committing the rest via git.

2013-11-17 18:02:43 +00:00

beesease.dm

-Finished work on the "cult" gamemode. I'll still add features to it later, but it is safe to be put on secret rotation now.

2010-11-02 19:13:32 +00:00

brainrot.dm

Commiting some soft Updates of commits I'm behind on and Committing the rest via git.

2013-11-17 18:02:43 +00:00

cold9.dm

Bugfixes:

2011-07-27 20:57:21 +00:00

cold.dm

Changed all chances of sleep curing diseases to laying down. Temporary, or perhaps permanent, fix because sleeping is broken.

2012-01-01 00:29:34 +00:00

dna_spread.dm

Resolves #283

2013-04-24 09:37:30 +01:00

fake_gbs.dm

Disease update:

2011-06-08 21:18:21 +00:00

flu.dm

Removed the flu causing hallucinations who the fuck even added that godamn.

2012-03-13 00:09:58 +00:00

fluspanish.dm

Okay I'm done testing on the players, I've set the diseases for cold9 and spanish flu to their own disease path stuffs.

2011-06-14 19:53:45 +00:00

gbs.dm

Implemented adjustToxLoss(amount)

2011-11-20 00:12:49 +00:00

jungle_fever.dm

Replacing monkie with monkey...

2011-11-28 19:39:22 +00:00

magnitis.dm

- Slightly rewrote the diseases. Spreading, stage updates, etc. Check the diffs if you want details.

2010-10-21 03:23:10 +00:00

pierrot_throat.dm

- Nerfed pierrot throat. You will only shout out "Honk" messages if you are at the last stage (stage 4). Made bananas cure pierrot throat with a 75% chance, instead of a 35% chance.

2012-06-24 05:48:05 +00:00

plasmatoid.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

retrovirus.dm

Resolves #283

2013-04-24 09:37:30 +01:00

rhumba_beat.dm

Implemented adjustToxLoss(amount)

2011-11-20 00:12:49 +00:00

robotic_transformation.dm

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

2013-09-12 19:59:53 -04:00

transformation.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

wizarditis.dm

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

2014-03-02 21:39:27 -08:00

xeno_transformation.dm

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

2013-09-12 19:59:53 -04:00