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

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
+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.")
@@ -10,7 +10,11 @@
icon_opened = "base"
/obj/structure/closet/secure_closet/guncabinet/Initialize()
. = ..()
..()
return INITIALIZE_HINT_LATELOAD
/obj/structure/closet/secure_closet/guncabinet/LateInitialize()
..()
update_icon()
/obj/structure/closet/secure_closet/guncabinet/toggle()
@@ -31,17 +35,12 @@
shottas++
if (lazors || shottas)
for (var/i = 0 to 2)
var/image/gun = image(icon(src.icon))
if (lazors > 0 && (shottas <= 0 || prob(50)))
lazors--
gun.icon_state = "laser"
add_overlay("laser[i]")
else if (shottas > 0)
shottas--
gun.icon_state = "projectile"
gun.pixel_x = i*4
add_overlay(gun)
add_overlay("projectile[i]")
add_overlay("door")
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB