Merge pull request #696 from Fox-McCloud/Goon-tweaks

[Goonchem] Tweaks, Fixes, etc.

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

@@ -10,7 +10,7 @@
 	icon_state = "brain1"
 
 	New()
-		var/datum/reagents/R = new/datum/reagents(1000)
+		var/datum/reagents/R = new/datum/reagents(330)
 		reagents = R
 		R.my_atom = src
 		..()

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

@@ -16,7 +16,7 @@
 		else
 			set_species()
 
-	var/datum/reagents/R = new/datum/reagents(1000)
+	var/datum/reagents/R = new/datum/reagents(330)
 	reagents = R
 	R.my_atom = src
 

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

@@ -38,7 +38,7 @@
 	uni_append = list(0x044,0xC5D) // 044C5D
 
 /mob/living/carbon/monkey/New()
-	var/datum/reagents/R = new/datum/reagents(1000)
+	var/datum/reagents/R = new/datum/reagents(330)
 	reagents = R
 	R.my_atom = src
 

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("mannitol","styptic_powder","methamphetamine","acetaminophen")
+	var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","sal_acid")
 
 	if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
 		return

code/modules/organs/blood.dm

@@ -74,6 +74,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					if (reagents.has_reagent("iron"))	//Hematogen candy anyone?
 						B.volume += 0.8
 						reagents.remove_reagent("iron", 0.1)
+					if (reagents.has_reagent("salglu_solution"))	//saline is good for blood regeneration
+						if(prob(33))
+							B.volume += 1.0
 
 		// Damaged heart virtually reduces the blood volume, as the blood isn't
 		// being pumped properly anymore.

code/modules/organs/pain.dm

@@ -9,7 +9,7 @@ mob/var/next_pain_time = 0
 // amount is a num from 1 to 100
 mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
 	if(stat >= 2) return
-	if(reagents.has_reagent("acetaminophen"))
+	if(reagents.has_reagent("sal_acid"))
 		return
 	if(reagents.has_reagent("morphine"))
 		return

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -159,6 +159,13 @@
 /obj/item/ammo_casing/shotgun/dart/attackby()
 	return
 
+/obj/item/ammo_casing/shotgun/tranquilizer
+	name = "tranquilizer darts"
+	desc = "A tranquilizer round used to subdue individuals utilizing stimulants."
+	icon_state = "cshell"
+	projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer"
+	m_amt = 250
+
 /obj/item/ammo_casing/syringegun
 	name = "syringe gun spring"
 	desc = "A high-power spring that throws syringes."

code/modules/projectiles/ammunition/boxes.dm

@@ -68,4 +68,10 @@
 /obj/item/ammo_box/shotgun/beanbag
 	name = "Ammunition Box (beanbag shells)"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-	m_amt = 4000
+	m_amt = 4000
+
+/obj/item/ammo_box/shotgun/tranquilizer
+	name = "Ammunition Box (tranquilizer darts)"
+	icon_state = "45box"
+	ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
+	m_amt = 2000

code/modules/projectiles/projectile/bullets.dm

@@ -182,6 +182,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "syringeproj"
 
+/obj/item/projectile/bullet/dart/syringe/tranquilizer
+	New()
+		..()
+		reagents.add_reagent("haloperidol", 15)
+
 /obj/item/projectile/bullet/neurotoxin
 	name = "neurotoxin spit"
 	icon_state = "neurotoxin"

code/modules/reagents/Chemistry-Machinery.dm

@@ -25,7 +25,7 @@
 	var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode."
 	var/list/broken_requirements = list()
 	var/broken_on_spawn = 0
-	var/recharge_delay = 15
+	var/recharge_delay = 5
 	var/image/icon_beaker = null //cached overlay
 
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -858,20 +858,6 @@ datum
 				..()
 				return
 
-		acetaminophen
-			name = "Acetaminophenl"
-			id = "acetaminophen"
-			description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller."
-			reagent_state = LIQUID
-			color = "#C855DC"
-			shock_reduction = 40
-			metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
-
-			on_mob_life(var/mob/living/M as mob) // what the fuck are you idiots smoking
-				if(!M) M = holder.my_atom
-				..()
-				return
-
 		mutagen
 			name = "Unstable mutagen"
 			id = "mutagen"
@@ -901,7 +887,7 @@ datum
 				return
 
 		hydrocodone
-			name = "Hydrocodone-Acetaminophen"
+			name = "Hydrocodone"
 			id = "hydrocodone"
 			description = "An extremely effective painkiller; may have long term abuse consequences."
 			reagent_state = LIQUID
@@ -1246,9 +1232,9 @@ datum
 				..()
 				return
 
-		inacusiate
-			name = "Inacusiate"
-			id = "inacusiate"
+		audioline
+			name = "Audioline"
+			id = "audioline"
 			description = "Heals ear damage."
 			reagent_state = LIQUID
 			color = "#6600FF" // rgb: 100, 165, 255
@@ -1260,10 +1246,10 @@ datum
 				..()
 				return
 
-		peridaxon
-			name = "Peridaxon"
-			id = "peridaxon"
-			description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
+		mitocholide
+			name = "Mitocholide"
+			id = "mitocholide"
+			description = "A specialized drugs that stimulates the mitochondria of cells to encourage healing of internal organs."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 
@@ -1292,7 +1278,7 @@ datum
 				if(M.bodytemperature < 170)
 					M.adjustCloneLoss(-1)
 					M.adjustOxyLoss(-10)
-					M.heal_organ_damage(3,3)
+					M.heal_organ_damage(12,12)
 					M.adjustToxLoss(-3)
 				..()
 				return

code/modules/reagents/Chemistry-Recipes.dm

@@ -75,20 +75,12 @@ datum
 			result_amount = 3
 			mix_message = "The substance turns neon green and bubbles unnervingly."
 
-		acetaminophen
-			name = "Acetaminophen"
-			id = "acetaminophen"
-			result = "acetaminophen"
-			required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1)
-			result_amount = 6
-			mix_message = "The mixture becomes a fine white powder."
-
 		hydrocodone
 			name = "Hydrocodone"
 			id = "hydrocodone"
 			result = "hydrocodone"
-			required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
-			result_amount = 3
+			required_reagents = list("morphine" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
+			result_amount = 2
 
 		thermite
 			name = "Thermite"
@@ -112,12 +104,11 @@ datum
 			required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
 			result_amount = 4
 
-		peridaxon
-			name = "Peridaxon"
-			id = "peridaxon"
-			result = "peridaxon"
-			required_reagents = list("styptic_powder" = 2, "clonexadone" = 2)
-			required_catalysts = list("plasma" = 5)
+		mitocholide
+			name = "mitocholide"
+			id = "mitocholide"
+			result = "mitocholide"
+			required_reagents = list("synthflesh" = 1, "clonexadone" = 1)
 			result_amount = 2
 
 		holy_water
@@ -127,13 +118,6 @@ datum
 			required_reagents = list("water" = 1, "mercury" = 1, "wine" = 1)
 			result_amount = 3
 
-		virus_food
-			name = "Virus Food"
-			id = "virusfood"
-			result = "virusfood"
-			required_reagents = list("water" = 1, "milk" = 1)
-			result_amount = 5
-
 		cryptobiolin
 			name = "Cryptobiolin"
 			id = "cryptobiolin"
@@ -164,12 +148,12 @@ datum
 			required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
 			result_amount = 2
 
-		inacusiate
-			name = "inacusiate"
-			id = "inacusiate"
-			result = "inacusiate"
-			required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
-			result_amount = 2
+		Audioline
+			name = "Audioline"
+			id = "audioline"
+			result = "audioline"
+			required_reagents = list("spaceacillin" = 1, "salglu_solution" = 1, "epinephrine" = 1)
+			result_amount = 3
 
 		glycerol
 			name = "Glycerol"
@@ -230,8 +214,8 @@ datum
 			name = "Virus Food"
 			id = "virusfood"
 			result = "virusfood"
-			required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5)
-			result_amount = 15
+			required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
+			result_amount = 3
 /*
 		mix_virus
 			name = "Mix Virus"

code/modules/reagents/newchem/chem_heater.dm

@@ -8,7 +8,7 @@
 	idle_power_usage = 40
 	var/obj/item/weapon/reagent_containers/beaker = null
 	var/temperature = 300
-	var/rate = 10 //heating/cooling rate, default is 10 kelvin per tick
+	var/rate = 15 //heating/cooling rate, default is 10 kelvin per tick
 	var/on = FALSE
 
 

code/modules/reagents/newchem/medicine.dm

@@ -264,6 +264,7 @@ datum/reagent/sal_acid
 	description = "This is a is a standard salicylate pain reliever and fever reducer."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
+	shock_reduction = 40
 	overdose_threshold = 25
 
 datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -21,7 +21,7 @@
 	reagent_ids = list("styptic_powder", "epinephrine", "salbutamol")
 
 /obj/item/weapon/reagent_containers/borghypo/crisis
-	reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen")
+	reagent_ids = list("salglu_solution", "epinephrine", "sal_acid")
 
 /obj/item/weapon/reagent_containers/borghypo/New()
 	..()

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -157,12 +157,12 @@
 
 /obj/item/weapon/reagent_containers/food/condiment/syndisauce
 	name = "Chef Excellence's Special Sauce"
-	desc = "A potent sauce distilled from the toxin glands of 1000 Space Carp with an extra touch of LSD because why not?"
-	amount_per_transfer_from_this = 1
-	volume = 20
+	desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious."
+	amount_per_transfer_from_this = 5
+	volume = 50
 	New()
 		..()
-		reagents.add_reagent("chefspecial", 20)
+		reagents.add_reagent("amanitin", 50)
 
 //Food packs. To easily apply deadly toxi... delicious sauces to your food!
 /obj/item/weapon/reagent_containers/food/condiment/pack

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -794,6 +794,23 @@
 				src.name = "donk-pocket"
 		return
 
+/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket
+	name = "Donk-pocket"
+	desc = "This donk-pocket is emitting a small amount of heat."
+	icon_state = "donkpocket"
+	filling_color = "#DEDEAB"
+	volume = 90
+	bitesize = 100 //nom the whole thing at once.
+
+	New()
+		..()
+		reagents.add_reagent("omnizine", 15)
+		reagents.add_reagent("teporone", 15)
+		reagents.add_reagent("synaptizine", 15)
+		reagents.add_reagent("salglu_solution", 15)
+		reagents.add_reagent("salbutamol", 15)
+		reagents.add_reagent("methamphetamine", 15)
+
 /obj/item/weapon/reagent_containers/food/snacks/brainburger
 	name = "brainburger"
 	desc = "A strange looking burger. It looks almost sentient."

code/modules/reagents/reagent_containers/glass/bottle.dm

@@ -242,4 +242,12 @@
 	icon_state = "rbottle6"
 	New()
 		..()
-		reagents.add_reagent("sacid", 50)
+		reagents.add_reagent("sacid", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde
+	name = "Formaldehyde Bottle"
+	desc = "A reagent bottle. Contains formaldehyde."
+	icon_state = "rbottle"
+	New()
+		..()
+		reagents.add_reagent("formaldehyde", 50)

code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm

@@ -62,7 +62,7 @@
 	icon_state = "valeleaves"
 	New(var/loc, var/potency)
 		..()
-		reagents.add_reagent("acetaminophen", potency * 5)
+		reagents.add_reagent("sal_acid", potency * 5)
 		reagents.add_reagent("salbutamol", potency * 2)
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)