Merge pull request #663 from Iamgoofball/muh_doctors_delight

MUH FIXES

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")
+	"copper","mercury","plasma","radium","water","ethanol","sugar","sacid","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."

code/modules/reagents/newchem/medicine.dm

@@ -144,7 +144,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
 	name = "Styptic Powder"
 	id = "styptic_powder"
 	result = "styptic_powder"
-	required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, "sacid" = 1)
+	required_reagents = list("aluminum" = 1, "hydrogen" = 1, "oxygen" = 1, "sacid" = 1)
 	result_amount = 4
 	mix_message = "The solution yields an astringent powder."
 

code/modules/reagents/newchem/toxins.dm

@@ -148,7 +148,7 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
 	required_temp = 380
 
 /datum/reagent/questionmark // food poisoning
-	name = "Bad Food"
+	name = "????"
 	id = "????"
 	description = "????"
 	reagent_state = LIQUID
@@ -198,8 +198,91 @@ datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
 	required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
 	result_amount = 3
 
+datum/reagent/facid/on_mob_life(var/mob/living/M as mob)
+	if(!M) M = holder.my_atom
+	M.adjustToxLoss(2*REM)
+	M.take_organ_damage(0, 1*REM)
+	..()
+	return
+
+datum/reagent/facid
+	name = "Fluorosulfuric Acid"
+	id = "facid"
+	description = ""
+	reagent_state = LIQUID
+	color = "#CF3600"
+
+datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+	if(!istype(M, /mob/living))
+		return //wooo more runtime fixin
+	if(method == TOUCH)
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+
+			if(H.wear_mask)
+				if(!H.wear_mask.unacidable)
+					qdel (H.wear_mask)
+					H.update_inv_wear_mask()
+					H << "\red Your mask melts away but protects you from the acid!"
+				else
+					H << "\red Your mask protects you from the acid!"
+				return
+
+			if(H.head)
+				if(prob(15) && !H.head.unacidable)
+					qdel(H.head)
+					H.update_inv_head()
+					H << "\red Your helmet melts away but protects you from the acid"
+				else
+					H << "\red Your helmet protects you from the acid!"
+				return
+
+			if(!H.unacidable)
+				var/datum/organ/external/affecting = H.get_organ("head")
+				if(affecting.take_damage(15, 0))
+					H.UpdateDamageIcon()
+				H.emote("scream")
+		else if(ismonkey(M))
+			var/mob/living/carbon/monkey/MK = M
+
+			if(MK.wear_mask)
+				if(!MK.wear_mask.unacidable)
+					qdel (MK.wear_mask)
+					MK.update_inv_wear_mask()
+					MK << "\red Your mask melts away but protects you from the acid!"
+				else
+					MK << "\red Your mask protects you from the acid!"
+				return
+
+			if(!MK.unacidable)
+				MK.take_organ_damage(min(15, volume * 4)) // same deal as sulphuric acid
+	else
+		if(!M.unacidable)
+			if(ishuman(M))
+				var/mob/living/carbon/human/H = M
+				var/datum/organ/external/affecting = H.get_organ("head")
+				if(affecting.take_damage(15, 0))
+					H.UpdateDamageIcon()
+				H.emote("scream")
+				H.status_flags |= DISFIGURED
+			else
+				M.take_organ_damage(min(15, volume * 4))
+
+datum/reagent/facid/reaction_obj(var/obj/O, var/volume)
+	if(istype(O,/obj/item/weapon/organ/head))
+		new/obj/item/weapon/skeleton/head(O.loc)
+		for(var/mob/M in viewers(5, O))
+			M << "\red \the [O] melts."
+		qdel(O)
+	if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)))
+		if(!O.unacidable)
+			var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
+			I.desc = "Looks like this was \an [O] some time ago."
+			for(var/mob/M in viewers(5, O))
+				M << "\red \the [O] melts."
+			qdel(O)
 /datum/chemical_reaction/facid
-	name = "Fluorosulfuric acid"
+	name = "Fluorosulfuric Acid"
 	id = "facid"
 	result = "facid"
 	required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)

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

@@ -192,4 +192,13 @@
 	icon_state = "bottle17"
 	New()
 		..()
-		reagents.add_reagent("frostoil", 30)
+		reagents.add_reagent("frostoil", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/morphine
+	name = "Morphine Bottle"
+	desc = "A small bottle. Contains morphine."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle17"
+	New()
+		..()
+		reagents.add_reagent("morphine", 30)