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

Corrected shuttle refuel time

Browse Source
This commit is contained in:
ShizCalev
2017-09-30 01:58:40 -04:00
committed by CitadelStationBot
parent 7d31aa7538
commit 7e2873cd46
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+6
View File
@@ -176,9 +176,15 @@ SUBSYSTEM_DEF(shuttle)
Good luck.")
return
emergency = backup_shuttle
<<<<<<< HEAD
if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay)
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)] before trying again.")
=======
var/srd = CONFIG_GET(number/shuttle_refuel_delay)
if(world.time - SSticker.round_start_time < srd)
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before trying again.")
>>>>>>> ced1e24... Corrected shuttle refuel time (#31108)
return
switch(emergency.mode)
tgstation.dme
+14
View File
@@ -163,6 +163,7 @@
#include "code\_onclick\hud\robot.dm"
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\swarmer.dm"
<<<<<<< HEAD
#include "code\citadel\_cit_helpers.dm"
#include "code\citadel\cit_areas.dm"
#include "code\citadel\cit_arousal.dm"
@@ -189,6 +190,8 @@
#include "code\citadel\organs\vagina.dm"
#include "code\citadel\organs\womb.dm"
#include "code\citadel\toys\dildos.dm"
=======
>>>>>>> ced1e24... Corrected shuttle refuel time (#31108)
#include "code\controllers\admin.dm"
#include "code\controllers\configuration.dm"
#include "code\controllers\configuration_citadel.dm"
@@ -198,6 +201,12 @@
#include "code\controllers\hooks.dm"
#include "code\controllers\master.dm"
#include "code\controllers\subsystem.dm"
#include "code\controllers\configuration\config_entry.dm"
#include "code\controllers\configuration\configuration.dm"
#include "code\controllers\configuration\entries\comms.dm"
#include "code\controllers\configuration\entries\config.dm"
#include "code\controllers\configuration\entries\dbconfig.dm"
#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\subsystem\acid.dm"
#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\assets.dm"
@@ -2130,7 +2139,12 @@
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
<<<<<<< HEAD
#include "code\modules\server_tools\server_tools.dm"
=======
#include "code\modules\server_tools\st_commands.dm"
#include "code\modules\server_tools\st_interface.dm"
>>>>>>> ced1e24... Corrected shuttle refuel time (#31108)
#include "code\modules\shuttle\arrivals.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\computer.dm"