Add additional extinguisher logging, transfer logging framework.

Conflicts:
	code/game/objects/items/weapons/extinguisher.dm

code/game/objects/items/weapons/extinguisher.dm

@@ -1,3 +1,4 @@
+
 /obj/item/weapon/extinguisher
 	name = "fire extinguisher"
 	desc = "A traditional red fire extinguisher."
@@ -13,6 +14,7 @@
 	force = 10
 	m_amt = 90
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
+<<<<<<< HEAD
 	var/list/reagents_to_log=list(
 		"fuel"=    "welder fuel",
 		"plasma"=  "plasma",
@@ -20,11 +22,20 @@
 		"sacid"=   "sulphuric acid"
 	)
 
+=======
+>>>>>>> 6ff7901... Add additional extinguisher logging, transfer logging framework.
 	var/max_water = 50
 	var/last_use = 1.0
 	var/safety = 1
 	var/sprite_name = "fire_extinguisher"
 
+	reagents_to_log=list(
+		"fuel"  =  "welder fuel",
+		"plasma"=  "plasma",
+		"pacid" =  "polytrinic acid",
+		"sacid" =  "sulphuric acid"
+	)
+
 /obj/item/weapon/extinguisher/mini
 	name = "fire extinguisher"
 	desc = "A light and compact fibreglass-framed model fire extinguisher."

code/game/objects/objs.dm

@@ -16,6 +16,10 @@
 	var/damtype = "brute"
 	var/force = 0
 
+	// What reagents should be logged when transferred TO this object?
+	// Reagent ID => friendly name
+	var/list/reagents_to_log=list()
+
 /obj/item/proc/is_used_on(obj/O, mob/user)
 
 /obj/proc/process()