cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Air alarm deconstruction fix.

Browse Source 
Air alarms can again be deconstructed, at the price of lost convenience.
This commit is contained in:
PsiOmega
2015-02-10 10:33:33 +01:00
parent 4deeebfe3e
commit 93a479099a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/wires/alarm.dm
View File

@@ -11,7 +11,7 @@ var/const/AALARM_WIRE_AALARM = 16
/datum/wires/alarm/CanUse(var/mob/living/L) /datum/wires/alarm/CanUse(var/mob/living/L)
var/obj/machinery/alarm/A = holder var/obj/machinery/alarm/A = holder
if(A.wiresexposed) if(A.wiresexposed && A.buildstage == 2)
return 1 return 1
return 0 return 0

11
code/game/machinery/alarm.dm
View File

@@ -915,8 +915,13 @@ table tr:first-child th:first-child { border: none;}
update_icon() update_icon()
return return
if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters)))) if (wiresexposed && istype(W, /obj/item/weapon/wirecutters))
return attack_hand(user) user.visible_message("<span class='warning'>[user] has cut the wires inside \the [src]!</span>", "You have cut the wires inside \the [src].")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
new/obj/item/stack/cable_coil(get_turf(src), 5)
buildstage = 1
update_icon()
return
if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
if(stat & (NOPOWER|BROKEN)) if(stat & (NOPOWER|BROKEN))
@@ -1303,7 +1308,7 @@ FIRE ALARM
/obj/machinery/firealarm/proc/delayed_reset() /obj/machinery/firealarm/proc/delayed_reset()
var/area/A = get_area(src) var/area/A = get_area(src)
if (!A) return if (!A) return
src = null src = null
spawn(600) spawn(600)
A.firereset() A.firereset()