TG container_type refactor

code/game/objects/items/devices/scanners.dm

@@ -439,7 +439,8 @@ REAGENT SCANNER
 	icon_state = "spectrometer"
 	item_state = "analyzer"
 	w_class = WEIGHT_CLASS_SMALL
-	flags = CONDUCT | OPENCONTAINER
+	flags = CONDUCT
+	container_type = OPENCONTAINER
 	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4

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

@@ -11,6 +11,7 @@
 	throw_speed = 2
 	throw_range = 7
 	force = 10
+	container_type = AMOUNT_VISIBLE
 	materials = list(MAT_METAL=90)
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
 	var/max_water = 50
@@ -36,11 +37,8 @@
 	sprite_name = "miniFE"
 
 /obj/item/extinguisher/examine(mob/user)
-	if(..(user, 0))
-		to_chat(usr, "[bicon(src)] [src.name] contains:")
-		if(reagents && reagents.reagent_list.len)
-			for(var/datum/reagent/R in reagents.reagent_list)
-				to_chat(user, "<span class='notice'>[R.volume] units of [R.name]</span>")
+	. = ..()
+	to_chat(user, "The safety is [safety ? "on" : "off"].")
 
 
 /obj/item/extinguisher/New()

code/game/objects/items/weapons/implants/implant_chem.dm

@@ -3,7 +3,7 @@
 	desc = "Injects things."
 	icon_state = "reagents"
 	origin_tech = "materials=3;biotech=4"
-	flags = OPENCONTAINER
+	container_type = OPENCONTAINER
 
 /obj/item/implant/chem/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>

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

@@ -13,7 +13,7 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,20,30,50,70)
 	volume = 70
-	flags = OPENCONTAINER
+	container_type = OPENCONTAINER
 
 /obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity)
 	if(!proximity)

code/game/objects/items/weapons/tanks/watertank.dm

@@ -116,7 +116,8 @@
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(25,50,100)
 	volume = 500
-	flags = NODROP | OPENCONTAINER | NOBLUDGEON
+	flags = NODROP | NOBLUDGEON
+	container_type = OPENCONTAINER
 
 	var/obj/item/watertank/tank
 

code/game/objects/structures/janicart.dm

@@ -7,7 +7,7 @@
 	icon_state = "cart"
 	anchored = 0
 	density = 1
-	flags = OPENCONTAINER
+	container_type = OPENCONTAINER
 	//copypaste sorry
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 	var/obj/item/storage/bag/trash/mybag	= null

code/game/objects/structures/mop_bucket.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mopbucket"
 	density = 1
-	flags = OPENCONTAINER
+	container_type = OPENCONTAINER
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
 /obj/structure/mopbucket/New()

code/game/objects/structures/watercloset.dm

@@ -115,8 +115,8 @@
 		if(!open)
 			return
 		var/obj/item/reagent_containers/RG = I
-		if(RG.is_open_container())
-			if(RG.reagents.total_volume >= RG.volume)
+		if(RG.is_refillable())
+			if(RG.reagents.holder_full())
 				to_chat(user, "<span class='warning'>[RG] is full.</span>")
 			else
 				RG.reagents.add_reagent("toiletwater", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))