cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1203 from CHOMPStationBot/upstream-merge-9618

Browse Source 
[MIRROR] Some minor fixes
This commit is contained in:
Razgriz
2021-01-27 18:11:47 -07:00
committed by GitHub
parent 46c8e161a2 9430c8ab11
commit 5bfa8593db
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/gateway.dm
+5 -2
View File
@@ -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)
maps/tether/tether-07-station3.dmm
+2 -2
View File
@@ -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,