[Goonchem] Transition to Goonchem

code/modules/mob/emote.dm

@@ -1,4 +1,4 @@
-#define EMOTE_COOLDOWN 50		//Time in deciseconds that the cooldown lasts
+#define EMOTE_COOLDOWN 20		//Time in deciseconds that the cooldown lasts
 
 //Emote Cooldown System (it's so simple!)
 /mob/proc/handle_emote_CD()

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -123,7 +123,7 @@
 			if( health <= 20 && prob(1) )
 				spawn(0)
 					emote("gasp")
-			if(!reagents.has_reagent("inaprovaline"))
+			if(!reagents.has_reagent("epinephrine"))
 				adjustOxyLoss(1)
 			Paralyse(3)
 

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -75,7 +75,7 @@
 			//if( health <= 20 && prob(1) )
 			//	spawn(0)
 			//		emote("gasp")
-			if(!reagents.has_reagent("inaprovaline"))
+			if(!reagents.has_reagent("epinephrine"))
 				adjustOxyLoss(1)
 			Paralyse(3)
 

code/modules/mob/living/carbon/human/emote.dm

@@ -712,6 +712,8 @@
 
 		// Needed for M_TOXIC_FART
 		if("fart")
+			if(reagents.has_reagent("simethicone"))
+				return
 //			playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
 			if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
 				viewers(src) << "<span class='warning'><b>[src] farts on the Bible!</b></span>"

code/modules/mob/living/carbon/human/life.dm

@@ -448,8 +448,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 		if(!breath || (breath.total_moles() == 0) || suiciding)
 			var/oxyloss = 0
-			if(reagents.has_reagent("inaprovaline"))
-				return
 			if(suiciding)
 				oxyloss = 2
 				adjustOxyLoss(oxyloss)//If you are suiciding, you should die a little bit faster
@@ -973,7 +971,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				if( health <= 20 && prob(1) )
 					spawn(0)
 						emote("gasp")
-				if(!reagents.has_reagent("inaprovaline"))
+				if(!reagents.has_reagent("epinephrine"))
 					adjustOxyLoss(1)*/
 
 			if(hallucination && !(species.flags & IS_SYNTHETIC))
@@ -1008,7 +1006,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				adjustStaminaLoss(-10)
 				adjustHalLoss(-3)
 				if (mind)
-					//Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of stoxin or similar.
+					//Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of morphine or similar.
 					if(player_logged)
 						sleeping = max(sleeping-1, 2)
 					else

code/modules/mob/living/carbon/metroid/life.dm

@@ -185,9 +185,9 @@
 	if (reagents.get_reagent_amount("plasma")>=5)
 		mutation_chance = min(mutation_chance + 5,50) //Prevents mutation chance going >50%
 		reagents.remove_reagent("plasma", 5)
-	if (reagents.get_reagent_amount("inaprovaline")>=5)
+	if (reagents.get_reagent_amount("epinephrine")>=5)
 		mutation_chance = max(mutation_chance - 5,0) //Prevents muation chance going <0%
-		reagents.remove_reagent("inaprovaline", 5)
+		reagents.remove_reagent("epinephrine", 5)
 	src.updatehealth()
 
 	return //TODO: DEFERRED
@@ -205,7 +205,7 @@
 
 	else if(src.health <= config.health_threshold_crit)
 
-		if(!src.reagents.has_reagent("inaprovaline"))
+		if(!src.reagents.has_reagent("epinephrine"))
 			src.adjustOxyLoss(10)
 
 		if(src.stat != DEAD)

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -83,7 +83,7 @@
 		tally += (283.222 - bodytemperature) / 10 * 1.75
 
 	if(reagents)
-		if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down
+		if(reagents.has_reagent("methamphetamine")) // Meth slows slimes down
 			tally *= 2
 
 		if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow

code/modules/mob/living/carbon/monkey/life.dm

@@ -503,7 +503,7 @@
 				if( health <= 20 && prob(1) )
 					spawn(0)
 						emote("gasp")
-				if(!reagents.has_reagent("inaprovaline"))
+				if(!reagents.has_reagent("epinephrine"))
 					adjustOxyLoss(1)
 				Paralyse(3)
 			if(halloss > 100)

code/modules/mob/living/carbon/shock.dm

@@ -11,12 +11,6 @@
 	1	* src.getCloneLoss() + 		\
 	1	* src.halloss
 
-	if(reagents.has_reagent("alkysine"))
-		src.traumatic_shock -= 5
-	if(reagents.has_reagent("inaprovaline"))
-		src.traumatic_shock -= 15
-	if(reagents.has_reagent("synaptizine"))
-		src.traumatic_shock -= 30
 	if(reagents.has_reagent("paracetamol"))
 		src.traumatic_shock -= 40
 	if(reagents.has_reagent("tramadol"))

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -125,14 +125,14 @@
 
 		src.emag = new /obj/item/weapon/reagent_containers/spray(src)
 
-		src.emag.reagents.add_reagent("pacid", 250)
+		src.emag.reagents.add_reagent("facid", 250)
 		src.emag.name = "Polyacid spray"
 		return
 
 /obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R)
 	if(src.emag)
 		var/obj/item/weapon/reagent_containers/spray/PS = src.emag
-		PS.reagents.add_reagent("pacid", 2)
+		PS.reagents.add_reagent("facid", 2)
 	..()
 
 /obj/item/weapon/robot_module/engineering
@@ -365,13 +365,13 @@
 		src.modules += new /obj/item/device/flash/cyborg/alien(src)
 		src.modules += new /obj/item/borg/sight/thermal/alien(src)
 		var/obj/item/weapon/reagent_containers/spray/alien/stun/S = new /obj/item/weapon/reagent_containers/spray/alien/stun(src)
-		S.reagents.add_reagent("stoxin",250) //nerfed to sleeptoxin to make it less instant drop.
+		S.reagents.add_reagent("morphine",250) //nerfed to sleeptoxin to make it less instant drop.
 		src.modules += S
 		var/obj/item/weapon/reagent_containers/spray/alien/smoke/A = new /obj/item/weapon/reagent_containers/spray/alien/smoke(src)
 		S.reagents.add_reagent("water",50) //Water is used as a dummy reagent for the smoke bombs. More of an ammo counter.
 		src.modules += A
 		src.emag = new /obj/item/weapon/reagent_containers/spray/alien/acid(src)
-		src.emag.reagents.add_reagent("pacid", 125)
+		src.emag.reagents.add_reagent("facid", 125)
 		src.emag.reagents.add_reagent("sacid", 125)
 
 /obj/item/weapon/robot_module/alien/hunter/add_languages(var/mob/living/silicon/robot/R)

code/modules/mob/living/simple_animal/borer.dm

@@ -259,7 +259,7 @@
 	if(chemicals < 50)
 		src << "You don't have enough chemicals!"
 
-	var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("alkysine","bicaridine","hyperzine","tramadol")
+	var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","tramadol")
 
 	if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
 		return

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -49,7 +49,7 @@
 	melee_damage_upper = 10
 	poison_per_bite = 10
 	var/atom/cocoon_target
-	poison_type = "stoxin"
+	poison_type = "morphine"
 	var/fed = 0
 
 //hunters have the most poison and move the fastest, so they can find prey

code/modules/mob/living/simple_animal/hostile/mushroom.dm

@@ -153,6 +153,6 @@
 	for(counter=0, counter<=powerlevel, counter++)
 		var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
 		S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
-		S.reagents.add_reagent("doctorsdelight", powerlevel)
+		S.reagents.add_reagent("omnizine", powerlevel)
 		S.reagents.add_reagent("synaptizine", powerlevel)
 	del(src)