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

Sec Cart Key Fixy

Browse Source 
Title. Fixes a downstream issue. This fixes  https://github.com/Yawn-Wider/YWPolarisVore/issues/465

Changelog Notes:

- Fixes broken key usage that, once taken out of the Security Cart, you can't put it back inside the vehicle.
This commit is contained in:
TheFurryFeline
2020-01-19 13:05:44 -05:00
committed by GitHub
parent d5324402c5
commit 5b179a8035
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/vehicles/Securitrain_vr.dm
View File

@@ -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. 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 active_engines = 1
var/obj/item/weapon/key/security/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. var/siren = 0 //This is for eventually getting the siren sprite to work.
/obj/item/weapon/key/security /obj/item/weapon/key/security
@@ -61,7 +62,7 @@
/obj/vehicle/train/security/engine/New() /obj/vehicle/train/security/engine/New()
..() ..()
cell = new /obj/item/weapon/cell/high(src) cell = new /obj/item/weapon/cell/high(src)
key = new(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 var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
overlays += I overlays += I
turn_off() //so engine verbs are correctly set 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) /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)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again
if(!key) if(!key)
user.drop_item() user.drop_item()
W.forceMove(src) W.forceMove(src)