Cael_Aislinn 01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-21 01:25:04 +10:00

..

alien_embryo.dm

-Committed RavingManiac (Smoke Carter)'s Roros laying eggs.

2012-10-17 06:04:25 +00:00

appendicitis.dm

Several medical related changes.

2012-10-18 12:39:04 +02:00

beesease.dm

…

brainrot.dm

brainloss is now only referenced via procs.

2011-12-30 17:47:35 +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

Fixes retrovirus bug where it wasn't curable.

2012-10-19 13:50:49 +02: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

…

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

…

retrovirus.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

rhumba_beat.dm

Implemented adjustToxLoss(amount)

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

robotic_transformation.dm

Ok, part 1 of this huge mind datum fix. I need to run over the next part again because I've made a lot inconsistencies in it. This is sort of all the misc stuff that got tidied up whilst I was trying to get my head around how everything related to eachother.

2012-08-05 15:29:15 +00:00

wizarditis.dm

ugh...this was horrible. I'm really sorry if I fucked anything up, I was literally going braindead towards the end.

2012-06-23 21:24:45 +00:00

xeno_transformation.dm

- Fixed one of the ways the Core R&D Computer can lock up and become completely unusable. If it gets stuck from using this method, just close the window and click on the computer again. Fixes issue 316.

2012-03-28 16:51:55 +00:00