shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

Browse Source
This commit is contained in:
SandPoot
2022-04-09 03:06:56 -03:00
parent d6624eb705 5e4aef0b30
commit 2555843026
88 changed files with 630 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/special.dm
+2 -3
View File
@@ -212,15 +212,14 @@
var/static/list/check_times = list()
/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
/obj/effect/forcefield/luxury_shuttle/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
if(mover in approved_passengers)
return TRUE
if(!isliving(mover)) //No stowaways
return FALSE
return FALSE
#define LUXURY_MESSAGE_COOLDOWN 100
/obj/effect/forcefield/luxury_shuttle/Bumped(atom/movable/AM)