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>

code/datums/diseases/appendicitis.dm

@@ -1,10 +1,10 @@
 /datum/disease/appendicitis
 	form = "Condition"
 	name = "Appendicitis"
-	max_stages = 3
+	max_stages = 4
 	spread = "Acute"
 	cure = "Surgery"
-	agent = "Shitty Appendix"
+	agent = "Appendix"
 	affected_species = list("Human")
 	permeability_mod = 1
 	contagious_period = 9001 //slightly hacky, but hey! whatever works, right?
@@ -12,16 +12,22 @@
 	severity = "Medium"
 	longevity = 1000
 	hidden = list(0, 1)
+	stage_minimum_age = 100 // at least 100 life ticks per stage
 
 /datum/disease/appendicitis/stage_act()
 	..()
 	switch(stage)
 		if(1)
-			if(prob(5)) affected_mob.emote("cough")
+			if(affected_mob.op_stage.appendix == 2.0)
+				// appendix is removed, can't get infected again
+				src.cure()
+			if(prob(5))
+				affected_mob << "\red You feel a stinging pain in your abdomen!"
+				affected_mob.emote("me",1,"winces slightly.")
 		if(2)
 			if(prob(3))
 				affected_mob << "\red You feel a stabbing pain in your abdomen!"
-				affected_mob.Stun(rand(2,3))
+				affected_mob.emote("me",1,"winces painfully.")
 				affected_mob.adjustToxLoss(1)
 		if(3)
 			if(prob(1))
@@ -38,4 +44,18 @@
 				else
 					affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!"
 					affected_mob.Weaken(10)
-					affected_mob.adjustToxLoss(3)
+					affected_mob.adjustToxLoss(3)
+
+		if(4)
+			if(prob(1) && ishuman(affected_mob))
+				var/mob/living/carbon/human/H = affected_mob
+				H << "\red Your abdomen is a world of pain!"
+				H.Weaken(10)
+				H.op_stage.appendix = 2.0
+
+				var/datum/organ/external/groin = H.get_organ("groin")
+				var/datum/wound/W = new /datum/wound/internal_bleeding(25)
+				H.adjustToxLoss(25)
+				groin.wounds += W
+
+				src.cure()

code/datums/diseases/dna_spread.dm

@@ -3,9 +3,9 @@
 	max_stages = 4
 	spread = "On contact"
 	spread_type = CONTACT_GENERAL
-	cure = "Ryetalin"
-	cure = "ryetalyn"
-	curable = 0
+	cure = "Ryetalyn"
+	cure_id = "ryetalyn"
+	curable = 1
 	agent = "S4E1 retrovirus"
 	affected_species = list("Human")
 	var/list/original_dna = list()