From 71d3dc5531b9d4e6acf3f0069f4a1fe46af838e4 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sun, 29 Apr 2012 20:21:58 +0100 Subject: [PATCH] TG: - Telecomm traffic control now has its own circuitboard and doesn't transform in to a server when the monitor is disconnected/reconnected Small fix for flamethrower - Using an igniter on a flamethrower that already has one attached no longer uses up the igniter Revision: r3324 Author: quartz235 --- code/game/machinery/computer/buildandrepair.dm | 5 +++++ code/game/machinery/telecomms/traffic_control.dm | 4 ++-- code/game/objects/items/weapons/flamethrower.dm | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 14c0ceb7485..0fd688bed81 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -192,6 +192,11 @@ build_path = "/obj/machinery/computer/telecomms/server" origin_tech = "programming=3" +/obj/item/weapon/circuitboard/comm_traffic + name = "Circuitboard (Telecommunications Traffic Control)" + build_path = "/obj/machinery/computer/telecomms/traffic" + origin_tech = "programming=3" + /obj/item/weapon/circuitboard/curefab name = "Circuit board (Cure fab)" build_path = "/obj/machinery/computer/curer" diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index dc63b558f0d..aee9ab68a4d 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -211,7 +211,7 @@ user << "\blue The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard( src.loc ) - var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) + var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) for (var/obj/C in src) C.loc = src.loc A.circuit = M @@ -222,7 +222,7 @@ else user << "\blue You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) + var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) for (var/obj/C in src) C.loc = src.loc A.circuit = M diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index c5ce4deb9ef..d206312b0a2 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -106,6 +106,7 @@ if(isigniter(W)) var/obj/item/device/assembly/igniter/I = W if(I.secured) return 0 + if(src.igniter) return user.remove_from_mob(I) I.loc = src igniter = I