cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #898 from SirBloodBuske/SirBloodBuske-Alarm-Deconstuct-Fix

Browse Source 
Update alarm.dm
This commit is contained in:
Fox-McCloud
2015-04-30 03:09:34 -04:00
parent cd8efd5c8c 797ec2377f
commit 8f686aab46
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/alarm.dm
+15 -6
View File
@@ -1130,17 +1130,26 @@ FIRE ALARM
if(wiresexposed)
switch(buildstage)
if(2)
if (istype(W, /obj/item/device/multitool))
if(istype(W, /obj/item/device/multitool))
src.detecting = !( src.detecting )
if (src.detecting)
user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
else
user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
else if(istype(W, /obj/item/weapon/wirecutters)) // cutting the wires out
user << "<span class='warning'>You cut the wires!</span>"
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
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()
if(1)
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if(coil.amount < 5)
user << "You need more cable for this!"
user << "<span class='warning'>You cut the wires!</span>"
return
coil.amount -= 5
@@ -1148,11 +1157,11 @@ FIRE ALARM
del(coil)
buildstage = 2
user << "You wire \the [src]!"
user << "<span class='notice'>You wire \the [src]!</span>"
update_icon()
else if(istype(W, /obj/item/weapon/crowbar))
user << "You pry out the circuit!"
user << "<span class='warning'>You pry out the circuit!</span>"
playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
spawn(20)
var/obj/item/weapon/firealarm_electronics/circuit = new /obj/item/weapon/firealarm_electronics()
@@ -1161,13 +1170,13 @@ FIRE ALARM
update_icon()
if(0)
if(istype(W, /obj/item/weapon/firealarm_electronics))
user << "You insert the circuit!"
user << "<span class='notice'>You insert the circuit!</span>"
del(W)
buildstage = 1
update_icon()
else if(istype(W, /obj/item/weapon/wrench))
user << "You remove the fire alarm assembly from the wall!"
user << "<span class='warning'>You remove the fire alarm assembly from the wall!</span>"
new /obj/item/mounted/frame/firealarm(get_turf(user))
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
del(src)