From 5e2bf79e16c2d8d35012d1e912baed6ad890a80e Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sun, 26 Jun 2016 04:21:52 -0700 Subject: [PATCH 1/2] Fixes charter not respecting true round start time. --- code/game/objects/items/charter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 8bdd989f5b1..039586ef89f 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -33,7 +33,7 @@ if(used) user << "This charter has already been used to name the station." return - if(!ignores_timeout && (world.time > CHALLENGE_TIME_LIMIT)) //5 minutes + if(!ignores_timeout && (world.time-round_start_time > CHALLENGE_TIME_LIMIT)) //5 minutes user << "The crew has already settled into the shift. \ It probably wouldn't be good to rename the station right now." return From ac20f387eccd9a24c01dd36574654aa17dd3adb1 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sun, 26 Jun 2016 04:26:18 -0700 Subject: [PATCH 2/2] Uses real round start time for declaring war. --- code/game/gamemodes/nuclear/nuclear_challenge.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 59aae11e11a..cfe00c03df6 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -50,8 +50,8 @@ if(user.z != ZLEVEL_CENTCOM) user << "You have to be at your base to use this." return 0 - if(world.time > CHALLENGE_TIME_LIMIT) - user << "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand." + if(world.time-round_start_time > CHALLENGE_TIME_LIMIT) + user << "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand." return 0 for(var/V in syndicate_shuttle_boards) var/obj/item/weapon/circuitboard/computer/syndicate_shuttle/board = V