Merge pull request #7189 from pudl/nanomed

nanomed update

code/modules/reagents/reagent_containers/glass.dm

@@ -183,6 +183,34 @@
 		reagents.add_reagent("slimejelly", 50)
 		update_icon()
 
+/obj/item/weapon/reagent_containers/glass/beaker/large/styptic
+	name = "styptic reserve tank"
+	New()
+		..()
+		reagents.add_reagent("styptic_powder", 100)
+		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/silver_sulfadiazine
+	name = "silver sulfadiazine reserve tank"
+	New()
+		..()
+		reagents.add_reagent("silver_sulfadiazine", 100)
+		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/charcoal
+	name = "antitoxin reserve tank"
+	New()
+		..()
+		reagents.add_reagent("charcoal", 100)
+		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/epinephrine
+	name = "epinephrine reserve tank"
+	New()
+		..()
+		reagents.add_reagent("epinephrine", 100)
+		update_icon()
+
 /obj/item/weapon/reagent_containers/glass/bucket
 	name = "bucket"
 	desc = "It's a bucket."

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

@@ -63,7 +63,7 @@
 	spawned_amount = 15
 
 /obj/item/weapon/reagent_containers/glass/bottle/charcoal
-	name = "charcoal bottle"
+	name = "antitoxin bottle"
 	desc = "A small bottle of charcoal."
 	icon_state = "bottle17"
 	spawned_reagent = "charcoal"
@@ -260,3 +260,28 @@
 	desc = "A small bottle. Contains a sample of invasive Apidae."
 	icon_state = "bottle3"
 	spawned_disease = /datum/disease/beesease
+
+/obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine
+	name = "antihistamine bottle"
+	desc = "A small bottle of diphenhydramine."
+	icon_state = "bottle20"
+	spawned_reagent = "diphenhydramine"
+
+/obj/item/weapon/reagent_containers/glass/bottle/potass_iodide
+	name = "anti-radiation bottle"
+	desc = "A small bottle of potassium iodide."
+	icon_state = "bottle11"
+	spawned_reagent = "potass_iodide"
+
+/obj/item/weapon/reagent_containers/glass/bottle/salglu_solution
+	name = "saline-glucose solution bottle"
+	desc = "A small bottle of saline-glucose solution."
+	icon_state = "bottle1"
+	spawned_reagent = "salglu_solution"
+
+/obj/item/weapon/reagent_containers/glass/bottle/atropine
+	name = "atropine bottle"
+	desc = "A small bottle of atropine."
+	icon_state = "bottle12"
+	spawned_reagent = "atropine"
+

code/modules/reagents/reagent_containers/patch.dm

@@ -22,7 +22,7 @@
 	return 1 // Masks were stopping people from "eating" patches. Thanks, inheritance.
 
 /obj/item/weapon/reagent_containers/pill/patch/styptic
-	name = "styptic powder patch"
+	name = "brute patch"
 	desc = "Helps with brute injuries."
 
 /obj/item/weapon/reagent_containers/pill/patch/styptic/New()
@@ -30,7 +30,7 @@
 	reagents.add_reagent("styptic_powder", 50)
 
 /obj/item/weapon/reagent_containers/pill/patch/silver_sulf
-	name = "silver sulfadiazine patch"
+	name = "burn patch"
 	desc = "Helps with burn injuries."
 
 /obj/item/weapon/reagent_containers/pill/patch/silver_sulf/New()

code/modules/reagents/reagent_containers/pill.dm

@@ -135,7 +135,7 @@
 	reagents.add_reagent("salbutamol", 30)
 
 /obj/item/weapon/reagent_containers/pill/charcoal
-	name = "charcoal pill"
+	name = "antitoxin pill"
 	desc = "Neutralizes many common toxins."
 	icon_state = "pill17"
 
@@ -146,8 +146,35 @@
 /obj/item/weapon/reagent_containers/pill/epinephrine
 	name = "epinephrine pill"
 	desc = "Used to stabilize patients."
-	icon_state = "pill17"
+	icon_state = "pill5"
 
 /obj/item/weapon/reagent_containers/pill/epinephrine/New()
 	..()
-	reagents.add_reagent("epinephrine", 50)
+	reagents.add_reagent("epinephrine", 50)
+
+/obj/item/weapon/reagent_containers/pill/mannitol
+	name = "mannitol pill"
+	desc = "Used to treat brain damage."
+	icon_state = "pill17"
+
+/obj/item/weapon/reagent_containers/pill/mannitol/New()
+	..()
+	reagents.add_reagent("mannitol", 50)
+
+/obj/item/weapon/reagent_containers/pill/mutadone
+	name = "mutadone pill"
+	desc = "Used to treat genetic damage."
+	icon_state = "pill20"
+
+/obj/item/weapon/reagent_containers/pill/mutadone/New()
+	..()
+	reagents.add_reagent("mutadone", 50)
+
+/obj/item/weapon/reagent_containers/pill/salicyclic
+	name = "salicyclic acid pill"
+	desc = "Used to dull pain."
+	icon_state = "pill5"
+
+/obj/item/weapon/reagent_containers/pill/salicyclic/New()
+	..()
+	reagents.add_reagent("sac_acid", 50)

code/modules/reagents/reagent_containers/syringes.dm

@@ -267,6 +267,14 @@
 		mode = SYRINGE_INJECT
 		update_icon()
 
+/obj/item/weapon/reagent_containers/syringe/calomel
+	name = "syringe (calomel)"
+	desc = "Contains calomel."
+	New()
+		..()
+		reagents.add_reagent("calomel", 15)
+		mode = SYRINGE_INJECT
+		update_icon()
 
 //Robot syringes
 //Not special in any way, code wise. They don't have added variables or procs.