Deconflict once again

code/game/objects/effects/decals/cleanable.dm

@@ -12,13 +12,13 @@
 		src.icon_state = pick(src.random_icon_states)
 	create_reagents(100)
 	if(smooth)
-		smooth_icon(src)
-		smooth_icon_neighbors(src)
+		queue_smooth(src)
+		queue_smooth_neighbors(src)
 	..()
 
 /obj/effect/decal/cleanable/Destroy()
 	if(smooth)
-		smooth_icon_neighbors(src)
+		queue_smooth_neighbors(src)
 	return ..()
 
 /obj/effect/decal/cleanable/attackby(obj/item/W as obj, mob/user as mob,)

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/random_items.dm

@@ -51,9 +51,9 @@
 /obj/item/reagent_containers/glass/bottle/random_reagent/New()
 	..()
 	var/list/possible_chems = GLOB.chemical_reagents_list.Copy()
-	possible_chems -= blocked_chems.Copy()
+	possible_chems -= GLOB.blocked_chems.Copy()
 	var/datum/reagent/R = pick(possible_chems)
-	if(rare_chemicals.Find(R))
+	if(GLOB.rare_chemicals.Find(R))
 		reagents.add_reagent(R, 10)
 	else
 		reagents.add_reagent(R, rand(2, 3)*10)
@@ -68,7 +68,7 @@
 /obj/item/reagent_containers/glass/bottle/random_chem/New()
 	..()
 	var/R = get_random_reagent_id()
-	if(rare_chemicals.Find(R))
+	if(GLOB.rare_chemicals.Find(R))
 		reagents.add_reagent(R, 10)
 	else
 		reagents.add_reagent(R, rand(2, 3)*10)
@@ -82,7 +82,7 @@
 
 /obj/item/reagent_containers/glass/bottle/random_base_chem/New()
 	..()
-	var/datum/reagent/R = pick(base_chemicals)
+	var/datum/reagent/R = pick(GLOB.base_chemicals)
 	reagents.add_reagent(R, rand(2, 6)*5)
 	name = "unlabelled bottle"
 	pixel_x = rand(-10, 10)
@@ -94,7 +94,7 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/random_drink/New()
 	..()
-	var/list/possible_drinks = drinks.Copy()
+	var/list/possible_drinks = GLOB.drinks.Copy()
 	if(prob(50))
 		possible_drinks += list("pancuronium","lsd","omnizine","blood")
 
@@ -113,7 +113,7 @@
 	..()
 
 	var/R = get_random_reagent_id()
-	if(rare_chemicals.Find(R))
+	if(GLOB.rare_chemicals.Find(R))
 		reagents.add_reagent(R, 10)
 	else
 		reagents.add_reagent(R, rand(3, 10)*10)
@@ -131,13 +131,13 @@
 /obj/item/storage/pill_bottle/random_meds/New()
 	..()
 	for(var/i in 1 to storage_slots)
-		var/list/possible_medicines = standard_medicines.Copy()
+		var/list/possible_medicines = GLOB.standard_medicines.Copy()
 		if(prob(50))
-			possible_medicines += rare_medicines.Copy()
+			possible_medicines += GLOB.rare_medicines.Copy()
 		var/datum/reagent/R = pick(possible_medicines)
 		var/obj/item/reagent_containers/food/pill/P = new(src)
 
-		if(rare_medicines.Find(R))
+		if(GLOB.rare_medicines.Find(R))
 			P.reagents.add_reagent(R, 10)
 		else
 			P.reagents.add_reagent(R, rand(2, 5)*10)
@@ -182,7 +182,7 @@
 
 /obj/structure/closet/crate/secure/chemicals/New()
 	..()
-	for(var/chem in standard_chemicals)
+	for(var/chem in GLOB.standard_chemicals)
 		var/obj/item/reagent_containers/glass/bottle/B = new(src)
 		B.reagents.add_reagent(chem, B.volume)
 		if(prob(85))

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

@@ -152,8 +152,13 @@ RCD
 				var/obj/item/pda/pda = I
 				I = pda.id
 			var/obj/item/card/id/ID = I
-			if(istype(ID) && ID && check_access(ID))
-				locked = 0
+			if(istype(ID) && ID)
+				if(check_access(ID))
+					locked = 0
+				else 
+					to_chat(usr, "<span class='warning'>This ID lacks access.</span>")
+			else
+				to_chat(usr, "<span class='warning'>You can't swipe without your ID in hand.</span>")
 		. = 1
 
 	if(href_list["logout"])

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, "<span class='notice'>The safety is [safety ? "on" : "off"].</span>")
 
 
 /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.dm

@@ -32,8 +32,8 @@
 	..()
 	if(smooth)
 		if(ticker && ticker.current_state == GAME_STATE_PLAYING)
-			smooth_icon(src)
-			smooth_icon_neighbors(src)
+			queue_smooth(src)
+			queue_smooth_neighbors(src)
 		icon_state = ""
 	if(climbable)
 		verbs += /obj/structure/proc/climb_on
@@ -46,7 +46,7 @@
 	if(smooth)
 		var/turf/T = get_turf(src)
 		spawn(0)
-			smooth_icon_neighbors(T)
+			queue_smooth_neighbors(T)
 	return ..()
 
 /obj/structure/proc/climb_on()

code/game/objects/structures/false_walls.dm

@@ -82,7 +82,7 @@
 	if(density)
 		icon_state = initial(icon_state)
 		smooth = SMOOTH_TRUE
-		smooth_icon(src)
+		queue_smooth(src)
 	else
 		icon_state = "fwall_open"
 
@@ -322,4 +322,4 @@
 	mineral = /obj/item/stack/sheet/mineral/plastitanium
 	walltype = /turf/simulated/wall/mineral/plastitanium
 	smooth = SMOOTH_MORE
-	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)

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/tables_racks.dm

@@ -50,8 +50,8 @@
 /obj/structure/table/update_icon()
 	if(smooth && !flipped)
 		icon_state = ""
-		smooth_icon(src)
-		smooth_icon_neighbors(src)
+		queue_smooth(src)
+		queue_smooth_neighbors(src)
 
 	if(flipped)
 		clear_smooth_overlays()

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))

code/game/objects/structures/window.dm

@@ -65,7 +65,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		else
 			to_chat(user, "<span class='notice'>The window is <i>unscrewed</i> from the floor, and could be deconstructed by <b>wrenching</b>.</span>")
 	if(!anchored && !fulltile)
-		to_chat(user, "<span class='notice'>Alt-click to rotate it clockwise.</span>")
+		to_chat(user, "<span class='notice'>Alt-click to rotate it.</span>")
 
 /obj/structure/window/New(Loc, direct)
 	..()
@@ -355,7 +355,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	set category = "Object"
 	set src in oview(1)
 
-	if(usr.stat || !usr.canmove || usr.restrained())
+	if(usr.incapacitated())
 		return
 
 	if(anchored)
@@ -378,7 +378,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	set category = "Object"
 	set src in oview(1)
 
-	if(usr.stat || !usr.canmove || usr.restrained())
+	if(usr.incapacitated())
 		return
 
 	if(anchored)
@@ -397,12 +397,31 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	return TRUE
 
 /obj/structure/window/AltClick(mob/user)
+
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
+
 	if(!Adjacent(user))
+		to_chat(user, "<span class='warning'>Move closer to the window!</span>")
 		return
-	revrotate()
+
+	if(anchored)
+		to_chat(user, "<span class='warning'>[src] cannot be rotated while it is fastened to the floor!</span>")
+		return FALSE
+
+	var/target_dir = turn(dir, 270)
+
+	if(!valid_window_location(loc, target_dir))
+		target_dir = turn(dir, 90)
+	if(!valid_window_location(loc, target_dir))
+		to_chat(user, "<span class='warning'>There is no room to rotate the [src]</span>")
+		return FALSE
+
+	setDir(target_dir)
+	ini_dir = dir
+	add_fingerprint(user)
+	return TRUE
 
 /obj/structure/window/Destroy()
 	density = FALSE
@@ -425,7 +444,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 /obj/structure/window/proc/update_nearby_icons()
 	update_icon()
 	if(smooth)
-		smooth_icon_neighbors(src)
+		queue_smooth_neighbors(src)
 
 /obj/structure/window/update_icon()
 	if(!QDELETED(src))
@@ -434,7 +453,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		var/ratio = obj_integrity / max_integrity
 		ratio = CEILING(ratio*4, 1) * 25
 		if(smooth)
-			smooth_icon(src)
+			queue_smooth(src)
 		overlays -= crack_overlay
 		if(ratio > 75)
 			return
@@ -714,4 +733,4 @@ obj/structure/window/full/reinforced/ice
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 120
 	level = 3
-	glass_amount = 2
+	glass_amount = 2