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

Bad mirror resolve
This commit is contained in:
LetterJay
2017-09-06 08:59:20 -05:00
committed by GitHub
10 changed files with 57 additions and 26 deletions
+2 -2
View File
@@ -105,8 +105,8 @@
/obj/machinery/button/emag_act(mob/user)
if(emagged)
return
req_access = null
req_one_access = null
req_access = list()
req_one_access = list()
playsound(src, "sparks", 100, 1)
emagged = TRUE
+1 -1
View File
@@ -76,7 +76,7 @@
if(emagged)
return
emagged = TRUE
req_access = null
req_access = list()
say("DB error \[Code 0x00F1\]")
sleep(10)
say("Attempting auto-repair...")
@@ -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//