diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 5a67d06db0..e25b257d25 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -1,5 +1,5 @@
 /obj/machinery/hydroponics
-	name = "Hydroponics Tray"
+	name = "hydroponics tray"
 	icon = 'hydroponics.dmi'
 	icon_state = "hydrotray3"
 	density = 1
@@ -404,7 +404,7 @@ obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent in
 		src.updateicon()
 		src.visible_message("\red The mutated weeds in [src] spawned a \blue [src.myseed.plantname]!")
 	else
-		usr << "The few weeds in the tray seem to react, but only for a moment..."
+		usr << "The few weeds in the [src] seem to react, but only for a moment..."
 	return
 
 
@@ -441,7 +441,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			O.reagents.remove_reagent("water", b_amount)
 			src.waterlevel += b_amount
 			playsound(src.loc, 'slosh.ogg', 25, 1)
-			user << "You fill the tray with [b_amount] units of water."
+			user << "You fill the [src] with [b_amount] units of water."
 
 	//		Toxicity dilutation code. The more water you put in, the lesser the toxin concentration.
 			src.toxic -= round(b_amount/4)
@@ -449,7 +449,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				src.toxic = 0
 
 		else if(src.waterlevel >= 100)
-			user << "\red The hydroponics tray is already full."
+			user << "\red The [src] is already full."
 		else
 			user << "\red The bucket is not filled with water."
 		src.updateicon()
@@ -460,7 +460,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		src.nutrilevel = 10
 		src.yieldmod = myNut.yieldmod
 		src.mutmod = myNut.mutmod
-		user << "You replace the nutrient solution in the tray"
+		user << "You replace the nutrient solution in the [src]."
 		del(O)
 		src.updateicon()
 
@@ -661,7 +661,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			src.updateicon()
 
 		else
-			user << "\red The tray already has seeds in it!"
+			user << "\red The [src] already has seeds in it!"
 
 	else if (istype(O, /obj/item/device/analyzer/plant_analyzer))
 		if(src.planted && src.myseed)
@@ -709,7 +709,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	else if (istype(O, /obj/item/weapon/minihoe))  // The minihoe
 		//var/deweeding
 		if(src.weedlevel > 0)
-			user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the tray.")
+			user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].")
 			src.weedlevel = 0
 		else
 			user << "\red This plot is completely devoid of weeds. It doesn't need uprooting."
@@ -723,7 +723,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			src.weedlevel = 0
 		if (src.toxic > 100 ) // Make sure it won't go overoboard
 			src.toxic = 100
-		user << "You apply the weedkiller solution into the tray"
+		user << "You apply the weedkiller solution into the [src]."
 		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
 		del(O)
 		src.updateicon()
@@ -737,7 +737,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			src.pestlevel = 0
 		if (src.toxic > 100 ) // Make sure it won't go overoboard
 			src.toxic = 100
-		user << "You apply the pestkiller solution into the tray"
+		user << "You apply the pestkiller solution into the [src]."
 		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
 		del(O)
 		src.updateicon()
@@ -754,22 +754,22 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	else if(src.dead)
 		src.planted = 0
 		src.dead = 0
-		usr << text("You remove the dead plant from the tray")
+		usr << text("You remove the dead plant from the [src].")
 		del(src.myseed)
 		src.updateicon()
 	else
 		if(src.planted && !src.dead)
-			usr << text("The hydroponics tray has \blue [src.myseed.plantname] \black planted")
+			usr << text("The [src] has \blue [src.myseed.plantname] \black planted.")
 			if(src.health <= (src.myseed.endurance / 2))
 				usr << text("The plant looks unhealthy")
 		else
-			usr << text("The hydroponics tray is empty")
+			usr << text("The [src] is empty.")
 		usr << text("Water: [src.waterlevel]/100")
 		usr << text("Nutrient: [src.nutrilevel]/10")
 		if(src.weedlevel >= 5) // Visual aid for those blind
-			usr << text("The tray is filled with weeds!")
+			usr << text("The [src] is filled with weeds!")
 		if(src.pestlevel >= 5) // Visual aid for those blind
-			usr << text("The tray is filled with tiny worms!")
+			usr << text("The [src] is filled with tiny worms!")
 		usr << text ("") // Empty line for readability.
 
 /obj/item/seeds/proc/harvest(mob/user = usr)
@@ -977,7 +977,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	harvest = 0
 	lastproduce = src.age
 	if((yieldmod * myseed.yield) <= 0)
-		user << text("\red You fail to harvest anything useful")
+		user << text("\red You fail to harvest anything useful.")
 	else
 		user << text("You harvest from the [src.myseed.plantname]")
 	if(myseed.oneharvest)
diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm
deleted file mode 100644
index 68ea12bc83..0000000000
--- a/code/game/machinery/sink.dm
+++ /dev/null
@@ -1,122 +0,0 @@
-/obj/machinery/sink
-	name = "sink"
-	icon = 'device.dmi'
-	icon_state = "sink"
-	desc = "A sink used for washing one's hands and face."
-	anchored = 1
-	var/busy = 0 	//Something's being washed at the moment
-
-
-	attack_hand(mob/M as mob)
-		if(isrobot(M) || isAI(M))
-			return
-
-		if(busy)
-			M << "\red Someone's already washing something here."
-			return
-
-		var/turf/location = M.loc
-		if(!isturf(location)) return
-		usr << "\blue You start washing up."
-
-		busy = 1
-		sleep(40)
-		busy = 0
-
-		if(M.loc != location) return		//Person has moved away from the sink
-
-		M.clean_blood()
-		if(istype(M, /mob/living/carbon))
-			var/mob/living/carbon/C = M
-			C.clean_blood()
-			/*
-			if(C.r_hand)
-				C.r_hand.clean_blood()		// The hand you attack with is empty anyway, the other one should not be washed while doing this.
-			if(C.l_hand)
-				C.l_hand.clean_blood()
-
-			if(C.wear_mask)
-				C.wear_mask.clean_blood()  //- NOPE, Washing machine -Errorage
-			*/
-			if(istype(M, /mob/living/carbon/human))
-				/*if(C:w_uniform)
-					C:w_uniform.clean_blood()  //- NOPE, Washing machine -Errorage
-				if(C:wear_suit)
-					C:wear_suit.clean_blood()  //- NOPE, Washing machine -Errorage
-				if(C:shoes)
-					C:shoes.clean_blood()*/  //- NOPE, Washing machine -Errorage
-				if(C:gloves)
-					C:gloves.clean_blood()
-				/*if(C:head)
-					C:head.clean_blood()*/ //- NOPE, Washing machine -Errorage
-		for(var/mob/V in viewers(src, null))
-			V.show_message(text("\blue [M] washes up using \the [src]."))
-
-
-	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		if(busy)
-			user << "\red Someone's already washing something here."
-			return
-
-		if (istype(O, /obj/item/weapon/reagent_containers/glass/bucket))
-			O:reagents.add_reagent("water", 70)
-			user.visible_message( \
-				"\blue [user] fills the [O] using the [src].", \
-				"\blue You fill the [O] using the [src].")
-			return
-
-		if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks))
-			O:reagents.add_reagent("water", 10)
-			user.visible_message( \
-				"\blue [user] fills the [O] using the [src].", \
-				"\blue You fill the [O] using the [src].")
-			return
-		else if (istype(O, /obj/item/weapon/melee/baton))
-			var/obj/item/weapon/melee/baton/B = O
-			if (B.charges > 0 && B.status == 1)
-				flick("baton_active", src)
-				user.Stun(10)
-				user.stuttering = 10
-				user.Weaken(10)
-				if(isrobot(user))
-					var/mob/living/silicon/robot/R = user
-					R.cell.charge -= 20
-				else
-					B.charges--
-				user.visible_message( \
-					"[user] was stunned by his wet [O].", \
-					"\red You have wet \the [O], it shocks you!")
-				return
-
-		var/turf/location = user.loc
-		if(!isturf(location)) return
-
-		var/obj/item/I = O
-		if(!I || !istype(I,/obj/item)) return
-
-		usr << "\blue You start washing up."
-
-		busy = 1
-		sleep(40)
-		busy = 0
-
-		if(user.loc != location) return				//User has moved
-		if(!I) return 								//Item's been destroyed while washing
-		if(user.get_active_hand() != I) return		//Person has switched hands or the item in their hands
-
-		O.clean_blood()
-		user.visible_message( \
-			"\blue [user] washes \a [I] using \the [src].", \
-			"\blue You wash \a [I] using \the [src].")
-
-	shower
-		name = "Shower"
-		desc = "This is dumb."
-
-	kitchen
-		name = "Kitchen Sink"
-		icon_state = "sink_alt"
-
-	kitchen2
-		name = "Kitchen Sink"
-		icon_state = "sink_alt2"
diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm
index 97c6c90b2a..0d85f851c8 100644
--- a/code/game/objects/watercloset.dm
+++ b/code/game/objects/watercloset.dm
@@ -40,27 +40,94 @@
 	density = 0
 	anchored = 1
 	var/on = 0
-	var/mist = 0	//needs a var so we can make it linger~
+	var/obj/effect/mist/mymist = null
+	var/ismist = 0	//needs a var so we can make it linger~
 
 //add heat controls? when emagged, you can freeze to death in it?
 
-/obj/structure/shower/attack_hand()
+/obj/effect/mist
+	name = "mist"
+	icon = 'watercloset.dmi'
+	icon_state = "mist"
+	layer = MOB_LAYER + 1
+	mouse_opacity = 0
+
+/obj/structure/shower/attack_hand(mob/M as mob)
 	on = !on
 	update_icon()
+	if(on && M.loc == loc)
+		wash(M)
+
+/obj/structure/shower/attackby(mob/M as mob)
+	attack_hand(M)
 
 /obj/structure/shower/update_icon()
 	overlays = null
+	if(mymist)
+		del(mymist)
+
 	if(on)
 		overlays += image('watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
-		spawn(50)
-			if(src && on)
-				overlays += image('watercloset.dmi', src, "mist", MOB_LAYER + 1, dir)
-				mist = 1
-	else if(mist)
-		overlays += image('watercloset.dmi', src, "mist", MOB_LAYER + 1, dir)
-		spawn(100)
+		if(!ismist)
+			spawn(50)
+				if(src && on)
+					ismist = 1
+					mymist = new /obj/effect/mist(loc)
+		else
+			ismist = 1
+			mymist = new /obj/effect/mist(loc)
+	else if(ismist)
+		ismist = 1
+		mymist = new /obj/effect/mist(loc)
+		spawn(250)
 			if(src && !on)
-				overlays = null
+				del(mymist)
+				ismist = 0
+
+/obj/structure/shower/HasEntered(atom/movable/O as obj|mob)
+	..()
+	wash(O)
+
+//Yes, showers are super powerful as far as washing goes.
+/obj/structure/shower/proc/wash(atom/movable/O as obj|mob)
+	..()
+	if(!on) return
+
+	O.clean_blood()
+
+	if(istype(O, /mob/living/carbon))
+		var/mob/living/carbon/monkey = O	//it's not necessarily a monkey, but >accurate varnames
+		if(monkey.r_hand)
+			monkey.r_hand.clean_blood()
+		if(monkey.l_hand)
+			monkey.l_hand.clean_blood()
+		if(monkey.wear_mask)
+			monkey.wear_mask.clean_blood()
+
+		if(istype(O, /mob/living/carbon/human))
+			var/mob/living/carbon/human/washer = O
+			if(washer.head)
+				washer.head.clean_blood()
+			if(washer.w_uniform)
+				washer.w_uniform.clean_blood()
+			if(washer.wear_suit)
+				washer.wear_suit.clean_blood()
+			if(washer.shoes)
+				washer.shoes.clean_blood()
+			if(washer.gloves)
+				washer.gloves.clean_blood()
+			if(washer.head)
+				washer.head.clean_blood()
+
+	if(loc)
+		var/turf/tile = get_turf(loc)
+		loc.clean_blood()
+		for(var/obj/effect/rune/R in tile)
+			del(R)
+		for(var/obj/effect/decal/cleanable/R in tile)
+			del(R)
+		for(var/obj/effect/overlay/R in tile)
+			del(R)
 
 
 
@@ -69,4 +136,121 @@
 	desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~"	//thanks doohl
 	icon = 'watercloset.dmi'
 	icon_state = "rubberducky"
-	item_state = "rubberducky"
\ No newline at end of file
+	item_state = "rubberducky"
+
+
+
+/obj/structure/sink
+	name = "sink"
+	icon = 'watercloset.dmi'
+	icon_state = "sink"
+	desc = "A sink used for washing one's hands and face."
+	anchored = 1
+	var/busy = 0 	//Something's being washed at the moment
+
+/obj/structure/sink/attack_hand(mob/M as mob)
+	if(isrobot(M) || isAI(M))
+		return
+
+	if(busy)
+		M << "\red Someone's already washing here."
+		return
+
+	var/turf/location = M.loc
+	if(!isturf(location)) return
+	usr << "\blue You start washing your hands."
+
+	busy = 1
+	sleep(40)
+	busy = 0
+
+	if(M.loc != location) return		//Person has moved away from the sink
+
+	if(istype(M, /mob/living/carbon))
+		var/mob/living/carbon/C = M
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/washer = C
+			if(washer.gloves)					//if they have gloves
+				washer.gloves.clean_blood()		//clean the gloves
+			else								//and if they don't,
+				washer.clean_blood()			//wash their hands (a mob being bloody means they are 'red handed')
+		else
+			C.clean_blood()						//other things that can't wear gloves should just wash the mob.
+	for(var/mob/V in viewers(src, null))
+		V.show_message(text("\blue [M] washes their hands using \the [src]."))
+
+/obj/structure/sink/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(busy)
+		user << "\red Someone's already washing here."
+		return
+
+	if (istype(O, /obj/item/weapon/reagent_containers/glass/bucket))
+		O:reagents.add_reagent("water", 70)
+		user.visible_message( \
+			"\blue [user] fills the [O] using \the [src].", \
+			"\blue You fill the [O] using \the [src].")
+		return
+
+	if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks))
+		O:reagents.add_reagent("water", 10)
+		user.visible_message( \
+			"\blue [user] fills the [O] using \the [src].", \
+			"\blue You fill the [O] using \the [src].")
+		return
+	else if (istype(O, /obj/item/weapon/melee/baton))
+		var/obj/item/weapon/melee/baton/B = O
+		if (B.charges > 0 && B.status == 1)
+			flick("baton_active", src)
+			user.Stun(10)
+			user.stuttering = 10
+			user.Weaken(10)
+			if(isrobot(user))
+				var/mob/living/silicon/robot/R = user
+				R.cell.charge -= 20
+			else
+				B.charges--
+			user.visible_message( \
+				"[user] was stunned by his wet [O].", \
+				"\red You have wet \the [O], it shocks you!")
+			return
+
+	var/turf/location = user.loc
+	if(!isturf(location)) return
+
+	var/obj/item/I = O
+	if(!I || !istype(I,/obj/item)) return
+
+	usr << "\blue You start washing \the [I]."
+
+	busy = 1
+	sleep(40)
+	busy = 0
+
+	if(user.loc != location) return				//User has moved
+	if(!I) return 								//Item's been destroyed while washing
+	if(user.get_active_hand() != I) return		//Person has switched hands or the item in their hands
+
+	O.clean_blood()
+	user.visible_message( \
+		"\blue [user] washes \a [I] using \the [src].", \
+		"\blue You wash \a [I] using \the [src].")
+
+
+/obj/structure/sink/kitchen
+	name = "kitchen sink"
+	icon_state = "sink_alt"
+
+
+/obj/structure/sink/puddle	//splishy splashy ^_^
+	name = "puddle"
+	icon_state = "puddle"
+
+/obj/structure/sink/puddle/attack_hand(mob/M as mob)
+	icon_state = "puddle-splash"
+	..()
+	icon_state = "puddle"
+
+/obj/structure/sink/puddle/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	icon_state = "puddle-splash"
+	..()
+	icon_state = "puddle"
\ No newline at end of file
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index fb7004b301..6f7147dea9 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -712,9 +712,8 @@
 		/obj/machinery/chem_dispenser/,
 		/obj/machinery/reagentgrinder,
 		/obj/structure/table,
-		/obj/structure/closet/secure_closet,
 		/obj/structure/closet,
-		/obj/machinery/sink,
+		/obj/structure/sink,
 		/obj/item/weapon/storage,
 		/obj/machinery/atmospherics/unary/cryo_cell,
 		/obj/item/weapon/chem_grenade,
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index 64ff18386a..60662478bb 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -1038,7 +1038,7 @@
 		reagents.add_reagent("nutriment",12)
 
 	afterattack(obj/O as obj, mob/user as mob)
-		if(istype(O,/obj/machinery/sink) && !wrapped)
+		if(istype(O,/obj/structure/sink) && !wrapped)
 			user << "You place [name] under a stream of water..."
 			loc = get_turf(O)
 			return Expand()
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index c53ea7c9f8..bdd8683bce 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi
index 8077cfa5c3..b2fed68036 100644
Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ
diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm
index 9290c3c9e5..825338482e 100644
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -12,7 +12,7 @@
 "aal" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "aam" = (/obj/machinery/camera{c_tag = "Prison Bedroom"; dir = 2; network = "SS13"},/obj/machinery/camera{c_tag = "Prison Bedroom"; dir = 6; network = "Prison"},/turf/simulated/floor,/area/security/prison)
 "aan" = (/turf/simulated/wall,/area/security/prison)
-"aao" = (/obj/machinery/computer/arcade,/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/security/prison)
+"aao" = (/obj/item/clothing/suit/ianshirt,/obj/machinery/computer/arcade,/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/security/prison)
 "aap" = (/obj/structure/stool,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/security/prison)
 "aaq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/security/prison)
 "aar" = (/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/security/prison)
@@ -26,7 +26,7 @@
 "aaz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "aaA" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "aaB" = (/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison)
-"aaC" = (/obj/structure/table,/obj/structure/bedsheetbin,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison)
+"aaC" = (/obj/structure/table,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/bedsheetbin,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison)
 "aaD" = (/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/security/range)
 "aaE" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
 "aaF" = (/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/security/range)
@@ -51,7 +51,7 @@
 "aaY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "aaZ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/security/prison)
 "aba" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"; tag = ""},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
-"abb" = (/obj/item/weapon/soap/nanotrasen,/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
+"abb" = (/obj/item/weapon/soap/nanotrasen,/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
 "abc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/security/range)
 "abd" = (/turf/simulated/floor,/area/security/range)
 "abe" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/portable_atmospherics/scrubber/stationary,/turf/simulated/floor/plating,/area/security/prison)
@@ -104,7 +104,7 @@
 "abZ" = (/obj/machinery/computer/security,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos)
 "aca" = (/obj/machinery/light{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/security/hos)
 "acb" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/prison)
-"acc" = (/obj/structure/toilet,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
+"acc" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
 "acd" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden)
 "ace" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden)
 "acf" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/security/warden)
@@ -336,7 +336,7 @@
 "agx" = (/obj/machinery/door/window/eastright{dir = 1; name = "Security Delivery"; req_access_txt = "1"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "delivery"},/area/security/main)
 "agy" = (/obj/machinery/door/airlock/external{name = "Security External Airlock"; req_access_txt = "1; 13"},/turf/simulated/floor/plating,/area/security/main)
 "agz" = (/obj/structure/lattice,/obj/effect/sign/securearea{pixel_x = -32; pixel_y = 0},/turf/space,/area)
-"agA" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/security/brig)
+"agA" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/security/brig)
 "agB" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
 "agC" = (/turf/simulated/floor{icon_state = "white"},/area/security/brig)
 "agD" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig)
@@ -1191,7 +1191,7 @@
 "awU" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = "Streight"},/turf/simulated/floor,/area/ai_monitored/storage/eva)
 "awV" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "awW" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/door_control{id = "Dorm1"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters)
-"awX" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
+"awX" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "awY" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "awZ" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "axa" = (/obj/structure/closet/wardrobe/mixed,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters)
@@ -1260,7 +1260,7 @@
 "ayl" = (/obj/effect/sign/securearea,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
 "aym" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "E.V.A."; req_access = null; req_access_txt = "18"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva)
 "ayn" = (/obj/machinery/door/airlock{id_tag = "Dorm1"; name = "Dorm 1"},/turf/simulated/floor,/area/crew_quarters)
-"ayo" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
+"ayo" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "ayp" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "ayq" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "ayr" = (/obj/structure/table,/obj/item/clothing/under/suit_jacket/really_black,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters)
@@ -1406,7 +1406,7 @@
 "aBb" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aBc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters)
 "aBd" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/crew_quarters)
-"aBe" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
+"aBe" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aBf" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aBg" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aBh" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/recharge_station,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
@@ -1498,7 +1498,7 @@
 "aCP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/fsmaint)
 "aCQ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/hallway/primary/central)
 "aCR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/central)
-"aCS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
+"aCS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aCT" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aCU" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
 "aCV" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet)
@@ -1681,7 +1681,7 @@
 "aGq" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "aGr" = (/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar)
 "aGs" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar)
-"aGt" = (/obj/machinery/sink/kitchen2{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar)
+"aGt" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar)
 "aGu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/bar)
 "aGv" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aGw" = (/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
@@ -2054,7 +2054,7 @@
 "aNz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics)
 "aNA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/hydroponics)
 "aNB" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/crew_quarters/kitchen)
-"aNC" = (/obj/machinery/sink/kitchen2{pixel_y = 28},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen)
+"aNC" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen)
 "aND" = (/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen)
 "aNE" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen)
 "aNF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1439; icon_state = "off"; id_tag = null; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen)
@@ -2186,7 +2186,7 @@
 "aQb" = (/obj/item/device/radio/intercom{broadcasting = 0; layer = 4; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/hallway/primary/central)
 "aQc" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics)
 "aQd" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/hydroponics)
-"aQe" = (/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor,/area/hydroponics)
+"aQe" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor,/area/hydroponics)
 "aQf" = (/obj/structure/table,/obj/machinery/processor,/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen)
 "aQg" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/weapon/packageWrap,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen)
 "aQh" = (/obj/structure/table,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen)
@@ -2428,7 +2428,7 @@
 "aUJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet)
 "aUK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet)
 "aUL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
-"aUM" = (/obj/machinery/power/apc{dir = 4; name = "Locker Restrooms APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
+"aUM" = (/obj/machinery/power/apc{dir = 4; name = "Locker Restrooms APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aUN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aUO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/locker)
 "aUP" = (/obj/machinery/light/small{dir = 8},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/stack/rods{amount = 50},/turf/simulated/floor{icon_state = "floorgrime"},/area/quartermaster/storage)
@@ -2487,7 +2487,7 @@
 "aVQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/wall,/area/security/vacantoffice)
 "aVR" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/port)
 "aVS" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
-"aVT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
+"aVT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aVU" = (/obj/structure/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aVV" = (/obj/structure/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aVW" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/camera{c_tag = "Locker Room East"; dir = 4; network = "SS13"},/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/locker)
@@ -2547,7 +2547,7 @@
 "aWY" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/maintenance/port)
 "aWZ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/port)
 "aXa" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
-"aXb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
+"aXb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXc" = (/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXd" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "floorgrime"},/area/quartermaster/storage)
 "aXe" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/quartermaster/sorting)
@@ -2588,7 +2588,7 @@
 "aXN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/port)
 "aXO" = (/obj/machinery/door/airlock{name = "Unit 3"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXP" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
-"aXQ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
+"aXQ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/light,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet)
 "aXT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/crew_quarters/locker)
@@ -4065,7 +4065,7 @@
 "bAi" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bAj" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/table,/obj/item/weapon/folder/white,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bAk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "medpriv1"; name = "Privacy Shutters"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay)
-"bAl" = (/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bAl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bAm" = (/obj/structure/table,/obj/item/weapon/storage/gl_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/body_bag_box,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
 "bAn" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
 "bAo" = (/obj/structure/closet/secure_closet/RD,/obj/machinery/light{dir = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
@@ -4116,7 +4116,7 @@
 "bBh" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/turf/space,/area)
 "bBi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bBj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall,/area/medical/medbay)
-"bBk" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bBk" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bBl" = (/obj/machinery/door_control{id = "medpriv1"; name = "Privacy Shutters"; pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bBm" = (/obj/machinery/door/airlock/medical{name = "Patient Room 1"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bBn" = (/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 24},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
@@ -4187,7 +4187,7 @@
 "bCA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay)
 "bCB" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay)
 "bCC" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
-"bCD" = (/obj/machinery/sink{pixel_y = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bCD" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bCE" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/medbay)
 "bCF" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/crew_quarters/hor)
 "bCG" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/crew_quarters/hor)
@@ -4240,7 +4240,7 @@
 "bDB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/atmos)
 "bDC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/atmos)
 "bDD" = (/obj/structure/grille,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos)
-"bDE" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bDE" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bDF" = (/obj/machinery/door_control{id = "medpriv4"; name = "Privacy Shutters"; pixel_y = 25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bDG" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bDH" = (/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
@@ -4675,7 +4675,7 @@
 "bLU" = (/obj/structure/table,/obj/item/weapon/retractor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/surgery)
 "bLV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bLW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
-"bLX" = (/obj/machinery/requests_console{department = "Operating Theatre"; departmentType = 0; name = "OR RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery)
+"bLX" = (/obj/machinery/requests_console{department = "Operating Theatre"; departmentType = 0; name = "OR RC"; pixel_x = 30; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery)
 "bLY" = (/obj/machinery/r_n_d/server{id_with_download_string = "1;2"; id_with_upload_string = "1;2"; name = "Robotics R&amp;D Server"; server_id = 2},/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
 "bLZ" = (/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
 "bMa" = (/obj/machinery/alarm/server{dir = 1; pixel_y = -22},/turf/simulated/floor/grid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
@@ -4891,7 +4891,7 @@
 "bQc" = (/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery)
 "bQd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = "Streight"},/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Exterior Airlock"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/virology)
 "bQe" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
-"bQf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"bQf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bQg" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/medical/research{name = "Research Division"})
 "bQh" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/canister,/obj/machinery/light/small,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/medical/research{name = "Research Division"})
 "bQi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor,/area/medical/research{name = "Research Division"})
@@ -4930,7 +4930,7 @@
 "bQP" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bQQ" = (/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 23; pixel_y = 8; req_access_txt = "39"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery)
 "bQR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
-"bQS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -8; pixel_y = -19; req_access_txt = "39"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"bQS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -8; pixel_y = -19; req_access_txt = "39"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bQT" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "bQU" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bQV" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/apmaint)
@@ -8432,8 +8432,8 @@
 "dgh" = (/obj/machinery/conveyor{dir = 4; id = "mining_west"},/obj/machinery/mineral/output,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/west_outpost)
 "dgi" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal/deliveryChute{dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/west_outpost)
 "dgj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/mine/west_outpost)
-"dgk" = (/obj/structure/toilet,/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
-"dgl" = (/obj/machinery/sink{pixel_y = 30},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
+"dgk" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
+"dgl" = (/obj/structure/sink{pixel_y = 30},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
 "dgm" = (/obj/machinery/door/airlock{name = "Toilet"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
 "dgn" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor,/area/mine/lobby)
 "dgo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/mine/lobby)
diff --git a/tgstation.dme b/tgstation.dme
index 26d5c17d51..b5fc5c8c8b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -477,7 +477,6 @@
 #include "code\game\machinery\robot_fabricator.dm"
 #include "code\game\machinery\seed_extractor.dm"
 #include "code\game\machinery\shieldgen.dm"
-#include "code\game\machinery\sink.dm"
 #include "code\game\machinery\Sleeper.dm"
 #include "code\game\machinery\spaceheater.dm"
 #include "code\game\machinery\status_display.dm"