Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs

[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes

code/game/gamemodes/nuclear/nuclear.dm

@@ -163,7 +163,7 @@ proc/issyndicate(mob/living/M as mob)
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	return ..()
-	
+
 /datum/game_mode/proc/create_syndicate(var/datum/mind/synd_mind) // So we don't have inferior species as ops - randomize a human
 	var/mob/living/carbon/human/M = synd_mind.current
 	M.set_species("Human",1)
@@ -268,7 +268,7 @@ proc/issyndicate(mob/living/M as mob)
 	if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back)
 	if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back)
 	if(synd_mob.backbag == 4) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(synd_mob), slot_back)
-	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack)
+	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/initropidril(synd_mob), slot_in_backpack)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
 

code/game/machinery/vending.dm

@@ -890,7 +890,7 @@
 	req_access_txt = "5"
 	products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/morphine = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4,
 					/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
-					/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,
+					/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe/insulin = 4,/obj/item/weapon/reagent_containers/syringe = 12,
 					/obj/item/device/healthanalyzer = 5,/obj/item/device/healthupgrade = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2,
 					/obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2, /obj/item/device/sensor_device = 2)
 	contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6)

code/game/objects/items/stacks/medical.dm

@@ -49,7 +49,7 @@
 	name = "roll of gauze"
 	singular_name = "gauze length"
 	desc = "Some sterile gauze to wrap around bloody stumps."
-	icon_state = "brutepack"
+	icon_state = "gauze"
 	origin_tech = "biotech=1"
 
 /obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)

code/game/objects/items/weapons/storage/firstaid.dm

@@ -20,7 +20,7 @@
 
 /obj/item/weapon/storage/firstaid/fire
 	name = "fire first-aid kit"
-	desc = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
+	desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer."
 	icon_state = "ointment"
 	item_state = "firstaid-ointment"
 
@@ -30,34 +30,35 @@
 
 		icon_state = pick("ointment","firefirstaid")
 
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
 		new /obj/item/device/healthanalyzer( src )
 		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
-		new /obj/item/stack/medical/ointment( src )
-		new /obj/item/stack/medical/ointment( src )
-		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-		new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage
+		new /obj/item/weapon/reagent_containers/pill/salicylic( src )
 		return
 
 
 /obj/item/weapon/storage/firstaid/regular
+	desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer"
 	icon_state = "firstaid"
 
 	New()
 		..()
 		if (empty) return
-		new /obj/item/stack/medical/bruise_pack(src)
-		new /obj/item/stack/medical/bruise_pack(src)
-		new /obj/item/stack/medical/bruise_pack(src)
-		new /obj/item/stack/medical/ointment(src)
-		new /obj/item/stack/medical/ointment(src)
-		new /obj/item/device/healthanalyzer(src)
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic( src )
+		new /obj/item/weapon/reagent_containers/pill/salicylic( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+		new /obj/item/device/healthanalyzer( src )
 		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 		return
 
 /obj/item/weapon/storage/firstaid/toxin
 	name = "toxin first aid kit"
-	desc = "Used to treat when you have a high amounts of toxins in your body."
+	desc = "A medical kit designed to counter poisoning by common toxins. Contains three pills and syringes, and a health analyzer to determine the health of the patient."
 	icon_state = "antitoxin"
 	item_state = "firstaid-toxin"
 
@@ -67,33 +68,52 @@
 
 		icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
 
-		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-		new /obj/item/weapon/reagent_containers/pill/antitox( src )
-		new /obj/item/weapon/reagent_containers/pill/antitox( src )
-		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
+		new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
+		new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
+		new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+		new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+		new /obj/item/weapon/reagent_containers/pill/charcoal( src )
 		new /obj/item/device/healthanalyzer( src )
 		return
 
 /obj/item/weapon/storage/firstaid/o2
 	name = "oxygen deprivation first aid kit"
-	desc = "A box full of oxygen goodies."
+	desc = "A first aid kit that contains four pills of salbutamol, which is able to counter injuries caused by suffocation. Also contains a health analyzer to determine the health of the patient."
 	icon_state = "o2"
 	item_state = "firstaid-o2"
 
 	New()
 		..()
 		if (empty) return
-		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
-		new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/salbutamol( src )
+		new /obj/item/weapon/reagent_containers/pill/salbutamol( src )
+		new /obj/item/weapon/reagent_containers/pill/salbutamol( src )
+		new /obj/item/weapon/reagent_containers/pill/salbutamol( src )
 		new /obj/item/device/healthanalyzer( src )
 		return
 
+/obj/item/weapon/storage/firstaid/brute
+	name = "brute trauma treatment kit"
+	desc = "A medical kit that contains several medical patches and pills for treating brute injuries. Contains one epinephrine syringe for emergency use and a health analyzer."
+	icon_state = "brute"
+	item_state = "firstaid-brute"
+
+	New()
+		..()
+		if (empty) return
+
+		icon_state = pick("brute","brute2")
+
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+		new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+		new /obj/item/device/healthanalyzer(src)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
+		new /obj/item/stack/medical/bruise_pack(src)
+		return
+
 /obj/item/weapon/storage/firstaid/adv
 	name = "advanced first-aid kit"
 	desc = "Contains advanced medical treatments."
@@ -124,8 +144,8 @@
 	new /obj/item/clothing/accessory/stethoscope( src )
 	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
-	new /obj/item/weapon/reagent_containers/pill/bicaridine(src)
-	new /obj/item/weapon/reagent_containers/pill/dermaline(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
 	new /obj/item/weapon/reagent_containers/ld50_syringe(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 	return

code/modules/crafting/recipes.dm

@@ -150,8 +150,7 @@
 	name = "Overload Improvised Shell"
 	result = /obj/item/ammo_casing/shotgun/improvised/overload
 	reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
-				/datum/reagent/water = 5,
-				/datum/reagent/potassium = 5)
+				/datum/reagent/blackpowder = 5)
 	tools = list(/obj/item/weapon/screwdriver)
 	time = 5
 

code/modules/hydroponics/seed_datums.dm

@@ -1287,7 +1287,7 @@ proc/populate_seed_list()
 	packet_icon = "seed-wheat"
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/wheat)
 	plant_icon = "wheat"
-	chems = list("nutriment" = list(1,25))
+	chems = list("nutriment" = list(1,25), "corn_starch" = list(3,5))
 
 	lifespan = 25
 	maturation = 6

code/modules/reagents/Chemistry-Machinery.dm

@@ -19,7 +19,7 @@
 	var/hackedcheck = 0
 	var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
 	"sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron",
-	"copper","mercury","plasma","radium","water","ethanol","sugar","sacid","tungsten","iodine","bromine","silver")
+	"copper","mercury","plasma","radium","water","ethanol","sugar","tungsten","iodine","bromine","silver")
 	var/list/hacked_reagents = list("toxin")
 	var/hack_message = "You disable the safety safeguards, enabling the \"Mad Scientist\" mode."
 	var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode."
@@ -282,7 +282,7 @@
 	recharge_delay = 30
 	dispensable_reagents = list()
 	var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"),
-						 		list("lithium", "sugar", "sacid", "water", "copper", "mercury", "sodium"),
+						 		list("lithium", "sugar", "water", "copper", "mercury", "sodium"),
 								list("ethanol", "chlorine", "potassium", "aluminium","plasma", "radium", "fluorine", "iron"))
 
 /obj/machinery/chem_dispenser/constructable/New()

code/modules/reagents/Chemistry-Reagents.dm

@@ -752,9 +752,21 @@ datum
 			description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
 			reagent_state = SOLID
 			color = "#FFFFFF" // rgb: 255, 255, 255
+			overdose_threshold = 200 // Hyperglycaemic shock
 
 			on_mob_life(var/mob/living/M as mob)
 				M.nutrition += 1*REM
+				if(prob(4))
+					M.reagents.add_reagent("epinephrine", 1.2)
+				if(prob(50))
+					M.AdjustParalysis(-1)
+					M.AdjustStunned(-1)
+					M.AdjustWeakened(-1)
+				if(current_cycle >= 90)
+					M.jitteriness += 10
+				if(volume > overdose_threshold)
+					M << "<span class = 'danger'>You pass out from hyperglycemic shock!</span>"
+					M.Paralyse(1)
 				..()
 				return
 

code/modules/reagents/Chemistry-Recipes.dm

@@ -592,8 +592,15 @@ datum
 			name = "Space cleaner"
 			id = "cleaner"
 			result = "cleaner"
-			required_reagents = list("ammonia" = 1, "water" = 1)
-			result_amount = 2
+			required_reagents = list("ammonia" = 1, "water" = 1, "ethanol" = 1)
+			result_amount = 3
+
+		sulfuric_acid
+			name = "Sulfuric Acid"
+			id = "sacid"
+			result = "sacid"
+			required_reagents = list("sulfur" = 1, "oxygen" = 1, "hydrogen" = 1)
+			result_amount = 3
 
 ///////Changeling Blood Test/////////////
 		changeling_test

code/modules/reagents/newchem/medicine.dm

@@ -18,7 +18,6 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth
 			M.adjustFireLoss(-volume)
 			if(show_message)
 				M << "<span class='notice'>You feel your burns healing!</span>"
-			M.emote("scream")
 		if(method == INGEST)
 			M.adjustToxLoss(0.5*volume)
 			if(show_message)
@@ -254,7 +253,7 @@ datum/reagent/pen_acid/on_mob_life(var/mob/living/M as mob)
 	result_amount = 6
 
 datum/reagent/sal_acid
-	name = "Salicyclic Acid"
+	name = "Salicylic Acid"
 	id = "sal_acid"
 	description = "If you have less than 50 brute damage, there is a 50% chance to heal one unit. If overdosed it will have a 50% chance to deal 2 brute damage if the patient has less than 50 brute damage already."
 	reagent_state = LIQUID

code/modules/reagents/newchem/other.dm

@@ -159,7 +159,7 @@ datum/reagent/triple_citrus
 datum/reagent/corn_starch
 	name = "Corn Starch"
 	id = "corn_starch"
-	description = "A slippery solution."
+	description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 
@@ -168,20 +168,40 @@ datum/reagent/corn_starch
 	id = "corn_syrup"
 	result = "corn_syrup"
 	required_reagents = list("corn_starch" = 1, "sacid" = 1)
-	result_amount = 5
+	result_amount = 2
 	required_temp = 374
 
 datum/reagent/corn_syrup
 	name = "Corn Syrup"
 	id = "corn_syrup"
-	description = "Decays into sugar."
+	description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 
 datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
-	M.reagents.add_reagent("sugar", 3)
-	M.reagents.remove_reagent("corn_syrup", 1)
+	M.reagents.add_reagent("sugar", 1.2)
+	..()
+	return
+
+/datum/chemical_reaction/vhfcs
+	name = "vhfcs"
+	id = "vhfcs"
+	result = "vhfcs"
+	required_reagents = list("corn_syrup" = 1)
+	required_catalysts = list("enzyme" = 1)
+	result_amount = 1
+
+datum/reagent/vhfcs
+	name = "Very-high-fructose corn syrup"
+	id = "vhfcs"
+	description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose."
+	reagent_state = LIQUID
+	color = "#C8A5DC"
+
+datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
+	if(!M) M = holder.my_atom
+	M.reagents.add_reagent("sugar", 2.4)
 	..()
 	return
 

code/modules/reagents/newchem/patch.dm

@@ -14,4 +14,18 @@
 	icon_state = "bandaid"
 
 /obj/item/weapon/reagent_containers/pill/patch/afterattack(obj/target, mob/user , proximity)
-	return // thanks inheritance again
+	return // thanks inheritance again
+
+/obj/item/weapon/reagent_containers/pill/patch/styptic
+	name = "healing patch"
+	desc = "Helps with brute injuries."
+	New()
+		..()
+		reagents.add_reagent("styptic_powder", 40)
+
+/obj/item/weapon/reagent_containers/pill/patch/silver_sulf
+	name = "burn patch"
+	desc = "Helps with burn injuries."
+	New()
+		..()
+		reagents.add_reagent("silver_sulfadiazine", 40)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -90,7 +90,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/New()
 	..()
-	reagents.add_reagent("inaprovaline", 10)
+	reagents.add_reagent("epinephrine", 10)
 	update_icon()
 	return
 
@@ -119,7 +119,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine/New()
 	..()
-	reagents.remove_reagent("inaprovaline", 10)
+	reagents.remove_reagent("epinephrine", 10)
 	reagents.add_reagent("leporazine", 9)
 	reagents.add_reagent("lexorin", 1)
 	update_icon()
@@ -132,7 +132,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack/New()
 	..()
-	reagents.remove_reagent("inaprovaline", 10)
+	reagents.remove_reagent("epinephrine", 10)
 	reagents.add_reagent("hyperzine", 9)
 	reagents.add_reagent("lexorin", 1)
 	update_icon()

code/modules/reagents/reagent_containers/pill.dm

@@ -113,13 +113,13 @@
 		..()
 		reagents.add_reagent("toxin", 50)
 
-/obj/item/weapon/reagent_containers/pill/cyanide
-	name = "Cyanide pill"
+/obj/item/weapon/reagent_containers/pill/initropidril
+	name = "initropidril pill"
 	desc = "Don't swallow this."
 	icon_state = "pill5"
 	New()
 		..()
-		reagents.add_reagent("cyanide", 50)
+		reagents.add_reagent("initropidril", 50)
 
 /obj/item/weapon/reagent_containers/pill/adminordrazine
 	name = "Adminordrazine pill"
@@ -228,3 +228,27 @@
 		reagents.add_reagent("impedrezene", 10)
 		reagents.add_reagent("synaptizine", 5)
 		reagents.add_reagent("hyperzine", 5)
+
+/obj/item/weapon/reagent_containers/pill/charcoal
+	name = "Chacoal pill"
+	desc = "Neutralizes many common toxins."
+	icon_state = "pill17"
+	New()
+		..()
+		reagents.add_reagent("charcoal", 25)
+
+/obj/item/weapon/reagent_containers/pill/salicylic
+	name = "Salicylic Acid pill"
+	desc = "Commonly used to treat moderate pain and fevers."
+	icon_state = "pill4"
+	New()
+		..()
+		reagents.add_reagent("sal_acid", 20)
+
+/obj/item/weapon/reagent_containers/pill/salbutamol
+	name = "Salbutamol pill"
+	desc = "Used to treat respiratory distress."
+	icon_state = "pill8"
+	New()
+		..()
+		reagents.add_reagent("salbutamol", 20)

code/modules/reagents/reagent_containers/syringes.dm

@@ -506,4 +506,22 @@
 		reagents.add_reagent("inaprovaline", 7)
 		reagents.add_reagent("anti_toxin", 8)
 		mode = SYRINGE_INJECT
+		update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/charcoal
+	name = "Syringe (charcoal)"
+	desc = "Contains charcoal - used to treat toxins and damage from toxins."
+	New()
+		..()
+		reagents.add_reagent("charcoal", 15)
+		mode = SYRINGE_INJECT
+		update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/insulin
+	name = "Syringe (insulin)"
+	desc = "Contains insulin - used to treat diabetes."
+	New()
+		..()
+		reagents.add_reagent("insulin", 15)
+		mode = SYRINGE_INJECT
 		update_icon()