Bugfix Shotgun 3: The Revengeance (#10737)

code/game/objects/structures/girders.dm

@@ -14,6 +14,7 @@
 	build_amt = 2
 	var/material/reinf_material
 	var/reinforcing = 0
+	var/plating = FALSE
 
 /obj/structure/girder/examine(mob/user, distance, infix, suffix)
 	. = ..()
@@ -213,11 +214,18 @@
 		to_chat(user, "<span class='notice'>This material is too soft for use in wall construction.</span>")
 		return 0
 
-	to_chat(user, "<span class='notice'>You begin adding the plating...</span>")
+	if(!plating)
+		to_chat(user, "<span class='notice'>You begin adding the plating...</span>")
+		plating = TRUE
+	else
+		return TRUE
 
 	if(!do_after(user,40) || !S.use(2))
+		plating = FALSE
 		return 1 //once we've gotten this far don't call parent attackby()
 
+	plating = FALSE
+
 	if(anchored)
 		to_chat(user, "<span class='notice'>You added the plating!</span>")
 	else

code/game/objects/structures/watercloset.dm

@@ -454,6 +454,9 @@
 
 	// Filling/emptying open reagent containers
 	var/obj/item/reagent_containers/RG = O
+	if (istype(RG, /obj/item/reagent_containers/glass/rag))
+		return
+
 	if (istype(RG) && RG.is_open_container())
 		var/atype = alert(usr, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")