diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 75b33bf83fe..1aa1d7d1e74 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -287,6 +287,11 @@ ) /obj/machinery/alarm/proc/master_is_operating() + + + if (! alarm_area) + alarm_area = areaMaster + return alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER|BROKEN)) @@ -892,6 +897,15 @@ update_icon() return + if(istype(W, /obj/item/weapon/wirecutters)) // cutting the wires out + if (wires.wires_status == 31) // all wires cut + var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil() + new_coil.amount = 5 + new_coil.loc = user.loc + buildstage = 1 + update_icon() + return + if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters)))) return attack_hand(user) @@ -906,6 +920,8 @@ updateUsrDialog() else user << "\red Access denied." + + return if(1) @@ -1475,4 +1491,4 @@ Code shamelessly copied from apc_frame else usr << browse(null, "window=partyalarm") return - return + return diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 4c6c95129a5..2e38631ce6f 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -646,6 +646,7 @@ datum if((M.mind in ticker.mode.cult) && prob(10)) M << "\blue A cooling sensation from inside you brings you an untold calmness." ticker.mode.remove_cultist(M.mind) + ticker.mode.remove_all_cult_icons_from_client(M.client) // fixes the deconverted's own client not removing their mob's cult icon for(var/mob/O in viewers(M, null)) O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. // Vamps react to this like acid