From 7e2873cd460a1ac28992d74f552f30e80d038117 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 30 Sep 2017 01:58:40 -0400 Subject: [PATCH 1/4] Corrected shuttle refuel time --- code/controllers/subsystem/shuttle.dm | 6 ++++++ tgstation.dme | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 2b1080049e..c59cc0161f 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -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) diff --git a/tgstation.dme b/tgstation.dme index dbfeb68502..627244c246 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -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" From 99319f5d4dbb0cc97f2bcea4aebfcdb5bb78858d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 14:23:40 -0500 Subject: [PATCH 2/4] Update shuttle.dm --- code/controllers/subsystem/shuttle.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index c59cc0161f..705f0dbd81 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -176,15 +176,9 @@ 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) From 9bfbeafcf9d4fb0bb4c3f27781d4ab38e11be264 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 14:24:17 -0500 Subject: [PATCH 3/4] Update tgstation.dme --- tgstation.dme | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 627244c246..4649448e1d 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -163,7 +163,6 @@ #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" @@ -190,8 +189,6 @@ #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" @@ -2139,12 +2136,9 @@ #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" From 69f354718ceb56754811846c3467fef93a4a0669 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Oct 2017 13:02:25 -0500 Subject: [PATCH 4/4] Update tgstation.dme --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index c873eb24b1..1d878fc78b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2140,7 +2140,6 @@ #include "code\modules\ruins\spaceruin_code\TheDerelict.dm" #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\security_levels.dm" -#include "code\modules\server_tools\server_tools.dm" #include "code\modules\server_tools\st_commands.dm" #include "code\modules\server_tools\st_interface.dm" #include "code\modules\shuttle\arrivals.dm"