From 1cf4a707f7fcd6fdef092a40753e07511f0211e9 Mon Sep 17 00:00:00 2001 From: SirBloodBuske Date: Tue, 28 Apr 2015 23:05:54 -0700 Subject: [PATCH 1/4] Update alarm.dm --- code/game/machinery/alarm.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index a41fcc019f9..b736835c465 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1130,12 +1130,20 @@ 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.") + 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 << "You cut the wires!" + 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 From 2f7801809183b921e1ce169d0ae605597546bbd6 Mon Sep 17 00:00:00 2001 From: SirBloodBuske Date: Wed, 29 Apr 2015 12:42:20 -0700 Subject: [PATCH 2/4] Update alarm.dm --- code/game/machinery/alarm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b736835c465..5c74a34dbdf 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1139,6 +1139,7 @@ FIRE ALARM else if(istype(W, /obj/item/weapon/wirecutters)) // cutting the wires out user << "You cut the wires!" + playsound(get_turf(src), '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 From ae79fce8e8c56808071a26aeb9d62148d1c53c32 Mon Sep 17 00:00:00 2001 From: SirBloodBuske Date: Wed, 29 Apr 2015 23:42:43 -0700 Subject: [PATCH 3/4] Update alarm.dm Fix'd spans --- code/game/machinery/alarm.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 5c74a34dbdf..fc6bbc10433 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1135,11 +1135,11 @@ FIRE ALARM 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.") - + 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 << "You cut the wires!" - playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) + user << "You cut the wires!" + 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 @@ -1149,7 +1149,7 @@ FIRE ALARM 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 << "You cut the wires!" return coil.amount -= 5 @@ -1157,11 +1157,11 @@ FIRE ALARM del(coil) buildstage = 2 - user << "You wire \the [src]!" + user << "You wire \the [src]!" update_icon() else if(istype(W, /obj/item/weapon/crowbar)) - user << "You pry out the circuit!" + user << "You pry out the circuit!" 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() @@ -1170,13 +1170,13 @@ FIRE ALARM update_icon() if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) - user << "You insert the circuit!" + user << "You insert the circuit!" 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 << "You remove the fire alarm assembly from the wall!" new /obj/item/mounted/frame/firealarm(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) del(src) From 797ec2377f83ad0ca649f55975d8505a76a8c803 Mon Sep 17 00:00:00 2001 From: SirBloodBuske Date: Wed, 29 Apr 2015 23:52:09 -0700 Subject: [PATCH 4/4] Update alarm.dm --- code/game/machinery/alarm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index fc6bbc10433..528283098f3 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1149,7 +1149,7 @@ FIRE ALARM if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) - user << "You cut the wires!" + user << "You cut the wires!" return coil.amount -= 5