From 9f977f893f0b3ac99feae166279a3238f6d78be1 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:08:47 -0500 Subject: [PATCH] Merge pull request #9618 from Novacat/nova-basicfixes Some minor fixes --- 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 987d395992..22ae47b4c4 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.power_down() 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 417b211962..3dd41f4e75 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -22633,7 +22633,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, @@ -23149,7 +23149,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,