From 3ae2e4e4297c0f62ca8b12fe9b25531346ae6774 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 19 Jan 2020 12:37:55 -0500 Subject: [PATCH 1/2] Sec Cart Key Fixy Title, resolves #465. --- code/modules/vehicles/Securitrain_vr.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index f826ea2fcb..05877f668a 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,8 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/security/key + var/obj/item/weapon/key/key + var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. /obj/item/weapon/key/security @@ -61,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new(src) + key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -90,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/key/cargo_train)) + if(istype(W, key_type)) if(!key) user.drop_item() W.forceMove(src) From cf82af67d630fae9810ed5a0ec141e6e80f425da Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 19 Jan 2020 12:56:31 -0500 Subject: [PATCH 2/2] Comments. --- code/modules/vehicles/Securitrain_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 05877f668a..92424bde4d 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key + var/obj/item/weapon/key/key //TFF 19/1/20 - Bugfix for key being prevented from getting used again var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. @@ -62,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new key_type(src) + key = new key_type(src) //TFF 19/1/20 - Bugfix for key being prevented from getting used again var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -91,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, key_type)) + if(istype(W, key_type)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again if(!key) user.drop_item() W.forceMove(src)