Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve

Bad mirror resolve
2017-09-06 08:59:20 -05:00
parent 76f8b02ee6 af409af9cf
commit 2d469c62ef
10 changed files with 57 additions and 26 deletions
@@ -535,6 +535,7 @@
 	name = "puddle"
 	desc = "A puddle used for washing one's hands and face."
 	icon_state = "puddle"
+	resistance_flags = UNACIDABLE

 /obj/structure/sink/puddle/attack_hand(mob/M)
 	icon_state = "puddle-splash"
@@ -546,6 +547,10 @@
 	. = ..()
 	icon_state = "puddle"

+/obj/structure/sink/puddle/deconstruct(disassembled = TRUE)
+	qdel(src)
+
+

 //Shower Curtains//
 //Defines used are pre-existing in layers.dm//