From 0f26f8863b376c817eadb44f61e89f3753b7335b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jan 2021 13:50:28 -0500 Subject: [PATCH 1/3] Some minor fixes - UAVs disconnect immediately on entering a scatter gateway. - Replaces Tether's autolok lockers with emergency suit lockers (Autoloks were supposed to be exclusive to the Talon) --- code/modules/awaymissions/gateway.dm | 7 +++++-- maps/tether/tether-07-station3.dmm | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 6467eb6e15..c1c11aa60f 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -133,14 +133,17 @@ obj/machinery/gateway/centerstation/process() M.set_dir(SOUTH) return else - //VOREStation Addition Start: Prevent taurriding abuse + //VOREStation Addition Start: Prevent abuse + if(istype(M, /obj/item/device/uav)) + var/obj/item/device/uav/L = M + L.LAZYCLEARLIST(masters) if(istype(M, /mob/living)) var/mob/living/L = M if(LAZYLEN(L.buckled_mobs)) var/datum/riding/R = L.riding_datum for(var/rider in L.buckled_mobs) R.force_dismount(rider) - //VOREStation Addition End: Prevent taurriding abuse + //VOREStation Addition End: Prevent abuse var/obj/effect/landmark/dest = pick(awaydestinations) if(dest) M.forceMove(dest.loc) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 849c92f6ae..a82fdd2dfd 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -22638,7 +22638,7 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/closet/autolok_wall{ +/obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, /turf/simulated/floor/tiled/eris/white, @@ -23161,7 +23161,7 @@ health = 1e+006 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/closet/autolok_wall{ +/obj/structure/closet/emergsuit_wall{ pixel_x = 27 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, From 1778a37789ca6a25894440c036287f458c4389d2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jan 2021 14:01:27 -0500 Subject: [PATCH 2/3] Lets do this more gracefully. --- code/modules/awaymissions/gateway.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index c1c11aa60f..4b0877645d 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -136,7 +136,8 @@ obj/machinery/gateway/centerstation/process() //VOREStation Addition Start: Prevent abuse if(istype(M, /obj/item/device/uav)) var/obj/item/device/uav/L = M - L.LAZYCLEARLIST(masters) + L.power_down() + L.cell.charge = 0 if(istype(M, /mob/living)) var/mob/living/L = M if(LAZYLEN(L.buckled_mobs)) From af68ac2ee9493109098a66416115bd46a217dd17 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jan 2021 14:48:56 -0500 Subject: [PATCH 3/3] In hindsight draining the batt is probably overkill --- code/modules/awaymissions/gateway.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 4b0877645d..daf964e443 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -137,7 +137,6 @@ obj/machinery/gateway/centerstation/process() if(istype(M, /obj/item/device/uav)) var/obj/item/device/uav/L = M L.power_down() - L.cell.charge = 0 if(istype(M, /mob/living)) var/mob/living/L = M if(LAZYLEN(L.buckled_mobs))