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

Merge pull request #30768 from Cyberboss/BringingSexyBack

Browse Source 
Adds back required arrivals undockedness with a config
This commit is contained in:
oranges
2017-09-20 20:54:06 +12:00
committed by CitadelStationBot
parent accd92a676
commit 9ee60af5e8
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/configuration.dm
View File

@@ -278,6 +278,7 @@ GLOBAL_PROTECT(config_dir)
var/error_msg_delay = 50 // How long to wait between messaging admins about occurrences of a unique error
var/arrivals_shuttle_dock_window = 55 //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station
var/arrivals_shuttle_require_undocked = FALSE //Require the arrivals shuttle to be undocked before latejoiners can join
var/arrivals_shuttle_require_safe_latejoin = FALSE //Require the arrivals shuttle to be operational in order for latejoiners to join
var/mice_roundstart = 10 // how many wire chewing rodents spawn at roundstart.
@@ -818,6 +819,8 @@ GLOBAL_PROTECT(config_dir)
GLOB.MAX_EX_FLAME_RANGE = BombCap
if("arrivals_shuttle_dock_window")
arrivals_shuttle_dock_window = max(PARALLAX_LOOP_TIME, text2num(value))
if("arrivals_shuttle_require_undocked")
arrivals_shuttle_require_undocked = TRUE
if("arrivals_shuttle_require_safe_latejoin")
arrivals_shuttle_require_safe_latejoin = TRUE
if("mice_roundstart")

3
code/modules/mob/dead/new_player/new_player.dm
View File

@@ -329,6 +329,9 @@
if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
return FALSE
if(config.arrivals_shuttle_require_undocked)
SSshuttle.arrivals.RequireUndocked(src)
arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL
//Remove the player from the join queue if he was in one and reset the timer

3
config/game_options.txt
View File

@@ -486,6 +486,9 @@ Space_Budget 16
## Must be at least 30 to not break parallax I recommended at least 55 to be visually/aurally appropriate
ARRIVALS_SHUTTLE_DOCK_WINDOW 55
## Uncomment to require the arrivals shuttle to be in flight (if it can fly) before late join players can join
#ARRIVALS_SHUTTLE_REQUIRE_UNDOCKED
## Uncomment to prevent late join players from spawning if the arrivals shuttle is depressurized
#ARRIVALS_SHUTTLE_REQUIRE_SAFE_LATEJOIN