cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gun cabinet icon fix & Lobby vote fix (#2165)

Browse Source 
changes:

Fixed gun cabinet's icon.
Fixed #2164.
This commit is contained in:
Lohikar
2017-05-03 22:09:04 +03:00
committed by skull132
parent 26a35147cc
commit 2e0ad2eba5
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/ticker.dm
+2 -2
View File
@@ -321,9 +321,9 @@ var/datum/controller/subsystem/ticker/SSticker
var/mc_init_time = round(Master.initialization_time_taken, 1)
var/dynamic_time = LOBBY_TIME - mc_init_time
if (dynamic_time < config.vote_autogamemode_timeleft)
if (dynamic_time <= config.vote_autogamemode_timeleft)
pregame_timeleft = config.vote_autogamemode_timeleft + 10
log_debug("SSticker: dynamic set pregame time [dynamic_time]s was less than configured autogamemode vote time [config.vote_autogamemode_timeleft]s, clamping.")
log_debug("SSticker: dynamic set pregame time [dynamic_time]s was less than or equal to configured autogamemode vote time [config.vote_autogamemode_timeleft]s, clamping.")
else
pregame_timeleft = dynamic_time
log_debug("SSticker: dynamic set pregame time [dynamic_time]s was greater than configured autogamemode time, not clamping.")