cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18936 from MrStonedOne/patch-222

Browse Source 
Fixes charter/War declaration not respecting true round start time.
This commit is contained in:
oranges
2016-06-28 00:05:40 +12:00
committed by GitHub
parent 3883bfa4a9 ac20f387ec
commit 5641bf7983
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclear_challenge.dm
+2 -2
View File
@@ -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
code/game/objects/items/charter.dm
+1 -1
View File
@@ -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