From 2e0ad2eba5c221e4379b428d1b3bef6679e6a8bf Mon Sep 17 00:00:00 2001 From: Lohikar Date: Wed, 3 May 2017 14:09:04 -0500 Subject: [PATCH] Gun cabinet icon fix & Lobby vote fix (#2165) changes: Fixed gun cabinet's icon. Fixed #2164. --- code/controllers/subsystems/ticker.dm | 4 ++-- .../closets/secure/guncabinet.dm | 15 +++++++-------- icons/obj/guncabinet.dmi | Bin 1966 -> 2185 bytes 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index c10a2f26b01..fedf94f51de 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -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.") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index cf4c9b1a01b..36a2e676327 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -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") diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi index 657aa94192fc5fe53c062cf4627e19747011c9b9..43ce9cc12b75918a2fc4e488ba3ed25cf43f231c 100644 GIT binary patch literal 2185 zcma)8cQo6J7ym|x@oKAxO^Z}%ZKXUrW+;l(j#_!OYeet_PpzuefkugzsGyYAXlqr} zC}Imwjg}fUYb$F&+~ zp~q1i&Xf+%aW_$+hF*7XhhTz2F@XU9fF-04)UdTHaCL5J?DHAFGbdNwdSRqg_e#8` zG1u3xM`~&HdMFpOY5no+C$Xwd+gSSx;R*53;O$^U$|o1_{2DSGzE#aU*EQqpYTTpA zYgS=#-#Jd<8Lye29%{_WaYHOL<+nbg$kCKk_>$q@ez*Ozyu``~za~Q>hFc^o zIh7V3zd5r=Kbb(Q!w-OSFJfIQiFf+|fSG7&sCN@fSR(}b^7;sWY8kg9)!xcWqzO(b z_>wF7SzTP}FOm7jm0qVy1o&dCVUuyM8(BP5R+>yFBJA1{h>5~^D2DG0<4She<#coUPzYBbJ{Cmsy^~U3Zk;zFm zP|L-q^7yblQH`qu=9tczHXC>)zf!GVHPqV-(mkB6pv!1^5^f8@%U^Dq3-xb(oXvmD zMJQ9l)`_sln-19bR^;oZsxaNuEMK@a+%%}3%U&Xdo>>>MINd@S9-n11c7^;9=(a61 zT4p8>Mi+Cxxn8eC)^Ni-~Dra=Z)M&z?Dlulku}}JIO1%h2f$Dcn zlV!0OUZ$p7k>F-K6XKYW*|$KkLB{-c*QXa0$h`gY=iu~oWn)R-ulHIjig{hYUc1H1 z(qx<1>K?*&u%g=2tkB@H8=j2^GJ4G@^1?UN45s#9)37`>6eF-fA(XkO(DvEI%t5xk-3E&qEM4G-P8l1?w zm&W9IbBj2{wt4mg`_ZoRYagu`RyjmpNGvNB3+ZNeI;q0Mu_Un`W{KT;Sp1)2r~v>> z%q+E^dp1Bm7A_(Z_2`_adhhi9*lm^a0r-d~J|A~K;|u=m3NE1TWokioz8XeZcQ2l@ zw7=xW|CZ)=aQe$3)4il*Nwqo zuv|rAP8E#O!0&~ebhDM)xt(?{6ZkRH;>Lhy((xyWI(gy+7~hManxi!cmZZ|Lg%IoU zkZ%);D~gxgm@?D9Y$mw5L=p1NwGRCR%=nAa{{X|8)$Pso!`6Z$KXsn}ToQYUk~(FO z;b?yJcdmbNn+4hg8IvZwIb%fKP}NrnR{ir^GKd+)o2F@Ib4vkva-y}va-3i zE_xs{M03@FJ0gAgq8}9e@x{f(Tm9khroGKTtQdxUH($)zwG2^Xm@P2%$a3)sC9WgSBZ z-@%y-J_6k@bAWb0`ydKUuG%~mCC+0znZ+~!F;2EJw72JnFf#`qY@(&t`CpeBa~i^0 zyKrH8(GsG~Uw2mmo52sM4=;)vMYhz$=c`w7|J#|2DH2I3G(OY+s$~%ITySjXui?;j zpnYb*{pznPi)w}rAjBBis$-}}(yzBiDO%?bG}7wY+=kDMgsL3f3oD~C^WS4CCziu? z-tq@ZS1hv{uO7pamGD`+D|2v>iu(t^*~7w1Q1LLQ!X}j$ z-KEH0qhv%p_oHZJkBqu`u!k`ne&q z!s!15M4Wn1pi3>`VulAFkJ8UYa=8_W)ig$HAqnBD^Nn)k~*AMn{=5#GbM7tjn<|E+bx8EB%! WB+aACMw0$p0H#KkhE@9R@&5ziL=!v! literal 1966 zcmZvdXHe4#6UP4`Bs2*fK|zAyfK!_E76c50j?^O@C5Q=xPC($L#27kvl#4VYLICMS z3?N7m3{BxhstU?cr9&u+D2N_6^Oi67VfUHc-}7O2W@k3_x(%9_`y4j_0KDdADEm{z z{vDjq)4Z4;seLN6Xh)ZD6fVr0NC*ih1P1{?R6%-1CyWUfPV|XNyBnePy-uM#-OJbW zIrb@MS|=}mTwJmZ4B8S#Ri4vPv^l|Ku0a(&vx)QK+yleTX^{xLIvVyep53!ZN;+VU}O<%M%zOxbd~nHrECbY&eHnj#aX zEpo%_xnjBB86)tJC>)Asvs2*mlIh*zm4=?haqZ&aL#Bg8Vw~}v4O8r>P&hp(^tNDA z$geFSh6HrW5OQ9`Mka>qWtWz*HN9qwq=kl8m2~1b@^0OA34j;e&=B`G+R_1FCsygcODsSzQj-Ny!+f6 z5mf@N{E3u-^aRT-Uaul*0TT{N{*zTW7ZFObh8wkfi`-A>N zAO-Y~vM|nyvtIb5&qQd?^MoS1Z3>YQ7IJW;6CN44urUET6+*TC)h_Zzm_;d=?EhL9 zNDHih63!XKL|Edg_?0)TnazHZZZ&TRqB^)NK91$$=+%6d(^hO!meZ=HFF8FuEw6kz zzGuNqOe<&#Nbb3_xOk&lS7CuX)!#w|Q=gCSs$585RR^uYRPOM-y((@BBDOj?Di2B;c+ZbwM9NA8s3VD1+hz?BS`Q+(*u?hIZxCbwB>s?U}C?c)J+mk z4Rbp4U8CCcdV#T0E#Z#j+4I|uIG>yNvRbeNPaf9Lz9=^(CZC$``#~E!TcV}74ImZ} zUj4g&sCc)6#d;*O$k*vYmz`_L150DV@87+v9Be57`)%5~^n>s-eDr5$oZ6C5c6`kT zaxY$4Usim3!YQsfBmP}0ZTh32X`Kt+%h|m&FM)E%4;!p?00C}Y;V?jDwa@rZoct0! zYC<3slEvnA%1g$~viH?g8+YNgByf+F?D!Y%POW!KN;WYi!13Xh@ZTru{XsLjEJA+F zHye?3;MaEK{yxF_edOIJgo~@-_HP^GsKylc{JypYOt%}kDkC>1R02HDrjo?doo_B} z=;S0)Rb9=PgeziPJjjlLQ4mX>`EcFR^qs?FO!*D5Nw$vVh`W7K$_Vk{povVguDMJK zg{{`3Q+IjBP_dgMLT?`tHqV;etIe>9HSi3_%BGbN4rr<6O1?%5y{o351i2IQUkA!e zHWm-^LhldbT~zn@O|JZ8GWvl`qbKB94sTM**|;E;m6dQ25s_YeWAScN=JZX>r3)uO zB4BN8ovCqDcX?&5=jHHl-{>fRhJ+54*jVNWYnTo&vy}?|^3Nlqh&ZcuaW2ayxHRS#y^;RjpKsQ@|=wiZ8z#(o=lxh(Uv2-8%Hj zoBJ^}ljSsa6w96irqO8Z=F|q#wkuL+-INg02YT!vhzo0?vGCpT9&nvU6etnk(jH}Fk;T!+=4(S^4_NSBI@7*hZ r`zZP6E~S(?YQf?^jQF4J{!e}YzUvhhO-MBC^Z^6rCN`*gV=Uz_Etrs4