From 99319f5d4dbb0cc97f2bcea4aebfcdb5bb78858d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 14:23:40 -0500 Subject: [PATCH] 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)