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

Merge pull request #9618 from Novacat/nova-basicfixes

Browse Source 
Some minor fixes
This commit is contained in:
Novacat
2021-01-27 17:08:47 -05:00
committed by Chompstation Bot
parent e3a5367009
commit 9f977f893f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/awaymissions/gateway.dm
View File

@@ -133,14 +133,17 @@ obj/machinery/gateway/centerstation/process()
M.set_dir(SOUTH) M.set_dir(SOUTH)
return return
else 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)) if(istype(M, /mob/living))
var/mob/living/L = M var/mob/living/L = M
if(LAZYLEN(L.buckled_mobs)) if(LAZYLEN(L.buckled_mobs))
var/datum/riding/R = L.riding_datum var/datum/riding/R = L.riding_datum
for(var/rider in L.buckled_mobs) for(var/rider in L.buckled_mobs)
R.force_dismount(rider) R.force_dismount(rider)
//VOREStation Addition End: Prevent taurriding abuse //VOREStation Addition End: Prevent abuse
var/obj/effect/landmark/dest = pick(awaydestinations) var/obj/effect/landmark/dest = pick(awaydestinations)
if(dest) if(dest)
M.forceMove(dest.loc) M.forceMove(dest.loc)

4
maps/tether/tether-07-station3.dmm
View File

@@ -22633,7 +22633,7 @@
/obj/structure/bed/chair/shuttle{ /obj/structure/bed/chair/shuttle{
dir = 4 dir = 4
}, },
/obj/structure/closet/autolok_wall{ /obj/structure/closet/emergsuit_wall{
pixel_y = 32 pixel_y = 32
}, },
/turf/simulated/floor/tiled/eris/white, /turf/simulated/floor/tiled/eris/white,
@@ -23149,7 +23149,7 @@
health = 1e+006 health = 1e+006
}, },
/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/aux,
/obj/structure/closet/autolok_wall{ /obj/structure/closet/emergsuit_wall{
pixel_x = 27 pixel_x = 27
}, },
/turf/simulated/floor/tiled/eris/steel/gray_perforated, /turf/simulated/floor/tiled/eris/steel/gray_perforated,