Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	code/modules/clothing/gloves/boxing.dm
	code/modules/clothing/gloves/miscellaneous.dm

code/game/objects/effects/spawners/lootdrop.dm

@@ -61,7 +61,7 @@
 				/obj/item/bodybag = 1,
 				/obj/item/clothing/glasses/meson = 2,
 				/obj/item/clothing/glasses/sunglasses = 1,
-				/obj/item/clothing/gloves/white{color = "yellow"; desc = "The colors are a bit dodgy."; icon_state = "yellow"; item_color = "yellow"; item_state = "ygloves"; name = "insulated gloves"} = 1,
+				/obj/item/clothing/gloves/color/white{color = "yellow"; desc = "The colors are a bit dodgy."; icon_state = "yellow"; item_color = "yellow"; item_state = "ygloves"; name = "insulated gloves"} = 1,
 				/obj/item/clothing/head/hardhat = 1,
 				/obj/item/clothing/head/hardhat/red = 1,
 				/obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 1,

code/game/objects/items/toys.dm

@@ -67,7 +67,7 @@
 
 /obj/item/toy/balloon/throw_impact(atom/hit_atom)
 	if(src.reagents.total_volume >= 1)
-		src.visible_message("<span class='danger'>The [src] bursts!</span>","You hear a pop and a splash.")
+		src.visible_message("<span class='danger'>\The [src] bursts!</span>","You hear a pop and a splash.")
 		src.reagents.reaction(get_turf(hit_atom))
 		for(var/atom/A in get_turf(hit_atom))
 			src.reagents.reaction(A)
@@ -166,17 +166,17 @@
 						 "<span class='danger'> You hear a gunshot.</span>")
 
 /obj/item/toy/ammo/gun
-	name = "ammo-caps"
+	name = "capgun ammo"
 	desc = "Make sure to recyle the box in an autolathe when it gets empty."
 	icon = 'icons/obj/ammo.dmi'
-	icon_state = "357-7"
+	icon_state = "357OLD-7"
 	w_class = 1.0
 	g_amt = 10
 	m_amt = 10
 	var/amount_left = 7.0
 
 /obj/item/toy/ammo/gun/update_icon()
-	src.icon_state = text("357-[]", src.amount_left)
+	src.icon_state = text("357OLD-[]", src.amount_left)
 
 /obj/item/toy/ammo/gun/examine(mob/user)
 	..()
@@ -735,7 +735,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
 	src.cards -= choice
 	H.pickup(user)
 	user.put_in_active_hand(H)
-	src.visible_message("<span class='notice'>[user] draws a card from the deck.</span>", "<span class='notice'>You draw a card from the deck.</span>")
+	user.visible_message("<span class='notice'>[user] draws a card from the deck.</span>", "<span class='notice'>You draw a card from the deck.</span>")
 	if(cards.len > 26)
 		src.icon_state = "deck_[deckstyle]_full"
 	else if(cards.len > 10)

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

@@ -9,6 +9,7 @@ RPD
 #define PIPE_TRINARY	2
 #define PIPE_TRIN_M		3
 #define PIPE_UNARY		4
+#define PIPE_QUAD		5
 
 #define PAINT_MODE -2
 #define EATING_MODE -1
@@ -41,20 +42,18 @@ RPD
 	return
 
 /datum/pipe_info/meter/Render(var/dispenser,var/label)
-	return "<li><a href='?src=\ref[dispenser];makemeter=1;type=[PIPE_UNARY]'>[label]</a></li>" //hardcoding is no
+	return "<li><a href='?src=\ref[dispenser];makemeter=1;type=[dirtype]'>[label]</a></li>" //hardcoding is no
 
 var/global/list/disposalpipeID2State=list(
 	"pipe-s",
 	"pipe-c",
 	"pipe-j1",
-	"pipe-j2",
 	"pipe-y",
 	"pipe-t",
-	"condisposal",
+	"disposal",
 	"outlet",
 	"intake",
-	"pipe-j1s",
-	"pipe-j2s"
+	"pipe-j1s"
 )
 
 /datum/pipe_info/disposal
@@ -66,11 +65,11 @@ var/global/list/disposalpipeID2State=list(
 	src.icon_state=disposalpipeID2State[pid+1]
 	src.dir=2
 	src.dirtype=dt
-	if(pid<6 || pid>8)
+	if(pid<5 || pid>7)
 		icon_state = "con[icon_state]"
 
 /datum/pipe_info/disposal/Render(var/dispenser,var/label)
-	return "<li><a href='?src=\ref[dispenser];dmake=[id];type=[PIPE_UNARY]'>[label]</a></li>" //avoid hardcoding.
+	return "<li><a href='?src=\ref[dispenser];dmake=[id];type=[dirtype]'>[label]</a></li>" //avoid hardcoding.
 
 //find these defines in code\game\machinery\pipe\consruction.dm
 var/global/list/RPD_recipes=list(
@@ -80,7 +79,7 @@ var/global/list/RPD_recipes=list(
 		"Manifold"       = new /datum/pipe_info(PIPE_MANIFOLD, 			1, PIPE_TRINARY),
 		"Manual Valve"   = new /datum/pipe_info(PIPE_MVALVE, 			1, PIPE_BINARY),
 		"Digital Valve"  = new /datum/pipe_info(PIPE_DVALVE,			1, PIPE_BINARY),
-		"4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD,		1, PIPE_BINARY),
+		"4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD,		1, PIPE_QUAD),
 	),
 	"Devices"=list(
 		"Connector"      = new /datum/pipe_info(PIPE_CONNECTOR,			1, PIPE_UNARY),
@@ -105,14 +104,15 @@ var/global/list/RPD_recipes=list(
 		"Bent Pipe"      = new /datum/pipe_info(PIPE_INSULATED_BENT,	5, PIPE_BENT),
 	),
 	"Disposal Pipes" = list(
-		"Pipe"       = new /datum/pipe_info/disposal(DISP_PIPE_STRAIGHT,	PIPE_BINARY),
-		"Bent Pipe"  = new /datum/pipe_info/disposal(DISP_PIPE_BENT,		PIPE_BENT),
-		"Junction"   = new /datum/pipe_info/disposal(DISP_JUNCTION,			PIPE_TRINARY),
-		"Y-Junction" = new /datum/pipe_info/disposal(DISP_YJUNCTION,		PIPE_TRINARY),
-		"Trunk"      = new /datum/pipe_info/disposal(DISP_END_TRUNK,		PIPE_TRINARY),
-		"Bin"        = new /datum/pipe_info/disposal(DISP_END_BIN,			PIPE_UNARY),
-		"Outlet"     = new /datum/pipe_info/disposal(DISP_END_OUTLET,		PIPE_UNARY),
-		"Chute"      = new /datum/pipe_info/disposal(DISP_END_CHUTE,		PIPE_UNARY),
+		"Pipe"          = new /datum/pipe_info/disposal(DISP_PIPE_STRAIGHT,	PIPE_BINARY),
+		"Bent Pipe"     = new /datum/pipe_info/disposal(DISP_PIPE_BENT,		PIPE_TRINARY),
+		"Junction"      = new /datum/pipe_info/disposal(DISP_JUNCTION,			PIPE_TRINARY),
+		"Y-Junction"    = new /datum/pipe_info/disposal(DISP_YJUNCTION,		PIPE_TRINARY),
+		"Trunk"         = new /datum/pipe_info/disposal(DISP_END_TRUNK,		PIPE_TRINARY),
+		"Bin"           = new /datum/pipe_info/disposal(DISP_END_BIN,			PIPE_QUAD),
+		"Outlet"        = new /datum/pipe_info/disposal(DISP_END_OUTLET,		PIPE_UNARY),
+		"Chute"         = new /datum/pipe_info/disposal(DISP_END_CHUTE,		PIPE_UNARY),
+		"Sort Junction" = new /datum/pipe_info/disposal(DISP_SORTJUNCTION,	PIPE_TRINARY),
 	)
 )
 /obj/item/weapon/pipe_dispenser
@@ -342,6 +342,19 @@ var/global/list/RPD_recipes=list(
 			<a href="?src=\ref[src];setdir=[WEST]" title="West">&larr;</a>
 		</p>
 					"}
+		if(PIPE_QUAD) // Single icon_state (eg 4-way manifolds)
+			if(preview)
+				user << browse_rsc(new /icon(preview), "pipe.png")
+
+				dirsel += "<p>"
+				dirsel += render_dir_img(1,"pipe.png","Pipe")
+				dirsel += "</p>"
+			else
+				dirsel+={"
+		<p>
+			<a href="?src=\ref[src];setdir=1" title="Pipe">&#8597;</a>
+		</p>
+				"}
 
 	dat = {"
 <html>
@@ -450,20 +463,20 @@ var/global/list/RPD_recipes=list(
 		return
 	if(loc != user)
 		return
-	if(!isrobot(user) && !ishuman(user))
-		return 0
 	if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
 		return 0
 
 	switch(p_class)
 		if(PAINT_MODE) // Paint pipes
-			if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated))
+			if(!istype(A,/obj/machinery/atmospherics/pipe))
 				// Avoid spewing errors about invalid mode -2 when clicking on stuff that aren't pipes.
 				user << "<span class='warning'>\The [src]'s error light flickers.  Perhaps you need to only use it on pipes and pipe meters?</span>"
 				return 0
 			var/obj/machinery/atmospherics/pipe/P = A
 			playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
-			P.pipe_color = paint_color
+			P.color = paint_colors[paint_color]
+			P.pipe_color = paint_colors[paint_color]
+			P.stored.color = paint_colors[paint_color]
 			user.visible_message("<span class='notice'>[user] paints \the [P] [paint_color].</span>","<span class='notice'>You paint \the [P] [paint_color].</span>")
 			P.update_icon()
 			return 1
@@ -539,6 +552,8 @@ var/global/list/RPD_recipes=list(
 					if(7)
 						C.ptype = 8
 						C.density = 1
+					if(8)
+						C.ptype = 9
 				C.add_fingerprint(usr)
 				C.update()
 				return 1

code/game/objects/items/weapons/melee/misc.dm

@@ -25,83 +25,12 @@
 	icon_state = "baton"
 	item_state = "classic_baton"
 	slot_flags = SLOT_BELT
-	force = 10
-
-/obj/item/weapon/melee/classic_baton/attack(mob/M, mob/living/user)
-	add_fingerprint(user)
-	if((CLUMSY in user.mutations) && prob(50))
-		user << "<span class='warning'>You club yourself over the head!</span>"
-		user.Weaken(3 * force)
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			H.apply_damage(2 * force, BRUTE, "head")
-			H.forcesay(hit_appends)
-		else
-			user.take_organ_damage(2 * force)
-		return
-	add_logs(user, M, "attacked", object="[src.name]")
-
-	if(isrobot(M)) // Don't stun borgs, fix for issue #2436
-		..()
-		return
-	if(!isliving(M)) // Don't stun nonhuman things
-		return
-
-	if(user.a_intent == "harm")
-		if(!..()) return
-		if(M.stuttering < 7 && !(HULK in M.mutations))
-			M.stuttering = 7
-		M.Stun(7)
-		M.Weaken(7)
-		M.visible_message("<span class='danger'>[user] has beaten [M] with [src]!</span>", \
-							"<span class='userdanger'>[user] has beaten [M] with [src]!</span>")
-	else
-		playsound(loc, 'sound/effects/woodhit.ogg', 50, 1, -1)
-		M.Stun(7)
-		M.Weaken(7)
-		M.visible_message("<span class='danger'>[user] has stunned [M] with [src]!</span>", \
-							"<span class='userdanger'>[user] has stunned [M] with [src]!</span>")
-
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		H.forcesay(hit_appends)
-
-
-
-/obj/item/weapon/melee/telebaton
-	name = "telescopic baton"
-	desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "telebaton_0"
-	item_state = "telebaton_0"
-	slot_flags = SLOT_BELT
-	w_class = 2
-	force = 3
+	force = 12 //9 hit crit
+	w_class = 3
 	var/cooldown = 0
-	var/on = 0
+	var/on = 1
 
-/obj/item/weapon/melee/telebaton/attack_self(mob/user as mob)
-	on = !on
-	if(on)
-		user << "<span class ='warning'>You extend the baton.</span>"
-		icon_state = "telebaton_1"
-		item_state = "nullrod"
-		w_class = 4 //doesnt fit in backpack when its on for balance
-		force = 10 //seclite damage
-		attack_verb = list("smacked", "struck", "cracked", "beaten")
-	else
-		user << "<span class ='notice'>You collapse the baton.</span>"
-		icon_state = "telebaton_0"
-		item_state = "telebaton_0" //no sprite in other words
-		slot_flags = SLOT_BELT
-		w_class = 2
-		force = 3 //not so robust now
-		attack_verb = list("hit", "poked")
-
-	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
-	add_fingerprint(user)
-
-/obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob)
+/obj/item/weapon/melee/classic_baton/attack(mob/target as mob, mob/living/user as mob)
 	if(on)
 		add_fingerprint(user)
 		if((CLUMSY in user.mutations) && prob(50))
@@ -125,7 +54,7 @@
 			if(cooldown <= 0)
 				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 				target.Weaken(3)
-				add_logs(user, target, "stunned", object="telescopic baton")
+				add_logs(user, target, "stunned", object="classic baton")
 				src.add_fingerprint(user)
 				target.visible_message("<span class ='danger'>[user] has knocked down [target] with \the [src]!</span>", \
 					"<span class ='userdanger'>[user] has knocked down [target] with \the [src]!</span>")
@@ -138,4 +67,38 @@
 					cooldown = 0
 		return
 	else
-		return ..()
+		return ..()
+
+
+
+/obj/item/weapon/melee/classic_baton/telescopic
+	name = "telescopic baton"
+	desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "telebaton_0"
+	item_state = null
+	slot_flags = SLOT_BELT
+	w_class = 2
+	force = 0
+	on = 0
+
+/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob)
+	on = !on
+	if(on)
+		user << "<span class ='warning'>You extend the baton.</span>"
+		icon_state = "telebaton_1"
+		item_state = "nullrod"
+		w_class = 4 //doesnt fit in backpack when its on for balance
+		force = 10 //stunbaton damage
+		attack_verb = list("smacked", "struck", "cracked", "beaten")
+	else
+		user << "<span class ='notice'>You collapse the baton.</span>"
+		icon_state = "telebaton_0"
+		item_state = null //no sprite for concealment even when in hand
+		slot_flags = SLOT_BELT
+		w_class = 2
+		force = 0 //not so robust now
+		attack_verb = list("hit", "poked")
+
+	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
+	add_fingerprint(user)

code/game/objects/items/weapons/storage/belt.dm

@@ -121,7 +121,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
 		/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
 		/obj/item/device/flashlight/seclite,
-		/obj/item/weapon/melee/telebaton
+		/obj/item/weapon/melee/classic_baton/telescopic
 		)
 
 /obj/item/weapon/storage/belt/security/New()

code/game/objects/items/weapons/storage/boxes.dm

@@ -83,13 +83,13 @@
 
 /obj/item/weapon/storage/box/gloves/New()
 	..()
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
 
 /obj/item/weapon/storage/box/masks
 	name = "box of sterile masks"

code/game/objects/items/weapons/storage/toolbox.dm

@@ -61,7 +61,7 @@
 	new /obj/item/stack/cable_coil(src,30,color)
 	new /obj/item/stack/cable_coil(src,30,color)
 	if(prob(5))
-		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/gloves/color/yellow(src)
 	else
 		new /obj/item/stack/cable_coil(src,30,color)
 

code/game/objects/structures.dm

@@ -12,7 +12,6 @@
 
 /obj/structure/mech_melee_attack(obj/mecha/M)
 	if(M.damtype == "brute")
-		M.occupant_message("<span class='danger'>You hit [src].</span>")
 		visible_message("<span class='danger'>[M.name] has hit [src].</span>")
 		return 1
 	return 0

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -68,7 +68,7 @@
 	..()
 	new /obj/item/clothing/under/rank/janitor(src)
 	new /obj/item/weapon/cartridge/janitor(src)
-	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/weapon/caution(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -20,7 +20,7 @@
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/welding(src)
-	new /obj/item/clothing/gloves/yellow(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/weapon/cartridge/ce(src)
 	new /obj/item/device/radio/headset/heads/ce(src)
@@ -46,8 +46,8 @@
 
 /obj/structure/closet/secure_closet/engineering_electrical/New()
 	..()
-	new /obj/item/clothing/gloves/yellow(src)
-	new /obj/item/clothing/gloves/yellow(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/weapon/storage/toolbox/electrical(src)
 	new /obj/item/weapon/storage/toolbox/electrical(src)
 	new /obj/item/weapon/storage/toolbox/electrical(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -70,7 +70,7 @@
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/device/radio/headset/headset_med(src)
 	new /obj/item/weapon/defibrillator/loaded(src)
-	new /obj/item/clothing/gloves/latex/nitrile(src)
+	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/weapon/storage/belt/medical(src)
 	new /obj/item/clothing/glasses/hud/health(src)
 	new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
@@ -102,7 +102,7 @@
 	new /obj/item/weapon/cartridge/cmo(src)
 	new /obj/item/device/radio/headset/heads/cmo(src)
 	new /obj/item/weapon/defibrillator/loaded(src)
-	new /obj/item/clothing/gloves/latex/nitrile(src)
+	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/weapon/storage/belt/medical(src)
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/clothing/suit/toggle/wintercoat/medical(src)

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -42,7 +42,7 @@
 	new /obj/item/clothing/under/rank/research_director/turtleneck(src)
 	new /obj/item/weapon/cartridge/rd(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
-	new /obj/item/clothing/gloves/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
 	new /obj/item/device/radio/headset/heads/rd(src)
 	new /obj/item/weapon/tank/air(src)
 	new /obj/item/clothing/mask/gas(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -22,7 +22,7 @@
 	new /obj/item/weapon/cartridge/captain(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/device/radio/headset/heads/captain/alt(src)
-	new /obj/item/clothing/gloves/captain(src)
+	new /obj/item/clothing/gloves/color/captain(src)
 	new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
 	new /obj/item/clothing/head/santa(src)
 	new /obj/item/weapon/gun/energy/gun(src)
@@ -198,7 +198,7 @@
 	new /obj/item/clothing/under/rank/det(src)
 	new /obj/item/clothing/suit/det_suit(src)
 	new /obj/item/clothing/head/det_hat(src)
-	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/under/rank/det/grey(src)
 	new /obj/item/clothing/suit/det_suit/grey(src)
 	new /obj/item/clothing/head/fedora(src)

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -132,7 +132,7 @@
 	if(prob(20))
 		new /obj/item/device/multitool(src)
 	if(prob(5))
-		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/gloves/color/yellow(src)
 	if(prob(40))
 		new /obj/item/clothing/head/hardhat(src)
 

code/game/objects/structures/lattice.dm

@@ -1,6 +1,6 @@
 /obj/structure/lattice
-	desc = "A lightweight support lattice."
 	name = "lattice"
+	desc = "A lightweight support lattice."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "latticefull"
 	density = 0
@@ -18,7 +18,6 @@
 			qdel(LAT)
 	stored = new/obj/item/stack/rods(src)
 	icon = 'icons/obj/smoothlattice.dmi'
-	icon_state = "latticeblank"
 	updateOverlays()
 	for (var/dir in cardinal)
 		var/obj/structure/lattice/L
@@ -52,15 +51,15 @@
 	return
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
-
+	var/turf/T = get_turf(src)
 	if (istype(C, /obj/item/stack/tile/plasteel))
-		var/turf/T = get_turf(src)
-		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
-		return
+		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead (for building plating)
+	if(istype(C, /obj/item/stack/rods))
+		T.attackby(C, user) //see above, for building catwalks
 	if (istype(C, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = C
 		if(WT.remove_fuel(0, user))
-			user << "<span class='notice'>Slicing lattice joints ...</span>"
+			user << "<span class='notice'>Slicing [name] joints ...</span>"
 			Deconstruct()
 	return
 
@@ -78,14 +77,61 @@
 			if(!(istype(get_step(src, direction), /turf/space)))
 				dir_sum += direction
 
-	icon_state = "lattice[dir_sum]"
+	icon_state = "[name][dir_sum]"
 	return
 
 /obj/structure/lattice/Deconstruct()
 	var/turf/T = loc
 	stored.loc = T
+	updateOverlays()
 	..()
 
 /obj/structure/lattice/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FOUR)
-		Deconstruct()
+		Deconstruct()
+
+/obj/structure/lattice/catwalk
+	name = "catwalk"
+	desc = "A catwalk for easier EVA manuevering and cable placement."
+	icon_state = "catwalkfull"
+
+/obj/structure/lattice/catwalk/New()
+	var/turf/T = loc
+	T.cancable = 1
+	..()
+
+/obj/structure/lattice/catwalk/Destroy()
+	var/turf/T = loc
+	T.cancable = 0
+	for(var/obj/structure/cable/C in T)
+		C.Destroy()
+	..()
+
+/obj/structure/lattice/catwalk/Deconstruct()
+	var/turf/T = loc
+	T.cancable = 0
+	for(var/obj/structure/cable/C in T)
+		C.Deconstruct()
+	..()
+
+/obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob)
+	..()
+	if(istype(C, /obj/item/stack/cable_coil))
+		var/turf/T = get_turf(src)
+		T.attackby(C, user) //catwalks 'enable' coil laying on space tiles, not the catwalks themselves
+		return
+
+/obj/structure/lattice/catwalk/updateOverlays()
+	overlays.Cut()
+
+	var/dir_sum = 0
+
+	for (var/direction in cardinal)
+		if(locate(/obj/structure/lattice/catwalk, get_step(src, direction)))
+			dir_sum += direction
+		else
+			if(!(istype(get_step(src, direction), /turf/space)))
+				dir_sum += direction
+
+	icon_state = "[name][dir_sum]"
+	return

code/game/objects/structures/watercloset.dm

@@ -18,8 +18,10 @@
 
 /obj/structure/toilet/attack_hand(mob/living/user)
 	if(swirlie)
-		user.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie]'s head!</span>", "You hear reverberating porcelain.")
-		swirlie.adjustBruteLoss(8)
+		user.changeNext_move(CLICK_CD_MELEE)
+		playsound(src.loc, "swing_hit", 25, 1)
+		swirlie.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='userdanger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "You hear reverberating porcelain.")
+		swirlie.adjustBruteLoss(5)
 		return
 
 	if(cistern && !open)
@@ -55,6 +57,7 @@
 			return
 
 	if(istype(I, /obj/item/weapon/grab))
+		user.changeNext_move(CLICK_CD_MELEE)
 		var/obj/item/weapon/grab/G = I
 		if(!G.confirm())
 			return
@@ -64,21 +67,23 @@
 				if(GM.loc != get_turf(src))
 					user << "<span class='notice'>[GM] needs to be on [src].</span>"
 					return
-				if(open && !swirlie)
-					user.visible_message("<span class='danger'>[user] starts to give [GM] a swirlie!</span>", "<span class='notice'>You start to give [GM] a swirlie!</span>")
-					swirlie = GM
-					if(do_after(user, 30, 5, 0))
-						user.visible_message("<span class='danger'>[user] gives [GM] a swirlie!</span>", "<span class='notice'>You give [GM] a swirlie!</span>", "You hear a toilet flushing.")
-						if(iscarbon(GM))
-							var/mob/living/carbon/C = GM
-							if(!C.internal)
-								C.adjustOxyLoss(5)
-						else
-							GM.adjustOxyLoss(5)
-					swirlie = null
-				else
-					user.visible_message("<span class='danger'>[user] slams [GM.name] into [src]!</span>", "<span class='notice'>You slam [GM] into [src]!</span>")
-					GM.adjustBruteLoss(8)
+				if(!swirlie)
+					if(open)
+						GM.visible_message("<span class='danger'>[user] starts to give [GM] a swirlie!</span>", "<span class='userdanger'>[user] starts to give [GM] a swirlie!</span>")
+						swirlie = GM
+						if(do_after(user, 30, 5, 0))
+							GM.visible_message("<span class='danger'>[user] gives [GM] a swirlie!</span>", "<span class='userdanger'>[user] gives [GM] a swirlie!</span>", "You hear a toilet flushing.")
+							if(iscarbon(GM))
+								var/mob/living/carbon/C = GM
+								if(!C.internal)
+									C.adjustOxyLoss(5)
+							else
+								GM.adjustOxyLoss(5)
+						swirlie = null
+					else
+						playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
+						GM.visible_message("<span class='danger'>[user] slams [GM.name] into [src]!</span>", "<span class='userdanger'>[user] slams [GM.name] into [src]!</span>")
+						GM.adjustBruteLoss(5)
 			else
 				user << "<span class='notice'>You need a tighter grip.</span>"
 

code/game/objects/structures/window.dm

@@ -263,10 +263,6 @@
 		if(I.damtype == BRUTE || I.damtype == BURN)
 			user.changeNext_move(CLICK_CD_MELEE)
 			hit(I.force)
-			if(health <= 7)
-				anchored = 0
-				update_nearby_icons()
-				step(src, get_dir(user, src))
 		else
 			playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		..()