From 8cb02763e1dec491c90406db2124642d1275192a Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:19:58 -0500 Subject: [PATCH] Floodlight icon fix (#5461) # About the pull request Adds base icon state to floodlights No sprite changes, just renamed sprites # Explain why it's good for the game Floor floodlights should use floor sprites # Testing Photographs and Procedure
![image](https://github.com/cmss13-devs/cmss13/assets/56142455/7d9632f4-efba-46e4-8c6b-cf85e8dadc28)
# Changelog :cl: fix: Floor floodlights use correct sprites /:cl: --- code/game/machinery/floodlight.dm | 14 ++++++++------ icons/obj/structures/machinery/floodlight.dmi | Bin 1537 -> 3251 bytes 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 580fea644eec..b90f8adbbb3f 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -2,7 +2,7 @@ name = "emergency floodlight" desc = "A powerful light usually stationed near landing zones to provide better visibility." icon = 'icons/obj/structures/machinery/floodlight.dmi' - icon_state = "flood00" + icon_state = "flood_0" density = TRUE anchored = TRUE light_power = 2 @@ -11,13 +11,14 @@ idle_power_usage = 0 active_power_usage = 100 + ///How far the light will go when the floodlight is on var/on_light_range = 6 - ///Whether or not the floodlight can be toggled on or off var/toggleable = TRUE - ///Whether or not the floodlight is turned on, disconnected from whether it has power or is lit var/turned_on = FALSE + ///base state + var/base_icon_state = "flood" /obj/structure/machinery/floodlight/Initialize(mapload, ...) . = ..() @@ -60,7 +61,7 @@ /obj/structure/machinery/floodlight/update_icon() . = ..() - icon_state = "flood0[light_on]" + icon_state = "[base_icon_state]_[light_on]" /obj/structure/machinery/floodlight/power_change(area/master_area = null) . = ..() @@ -71,7 +72,7 @@ /obj/structure/machinery/floodlight/landing name = "landing light" desc = "A powerful light usually stationed near landing zones to provide better visibility. This one seems to have been bolted down and is unable to be moved." - icon_state = "flood01" + icon_state = "flood_1" use_power = USE_POWER_NONE needs_power = FALSE unslashable = TRUE @@ -81,5 +82,6 @@ turned_on = TRUE /obj/structure/machinery/floodlight/landing/floor - icon_state = "floor_flood01" + icon_state = "floor_flood_1" + base_icon_state = "floor_flood" density = FALSE diff --git a/icons/obj/structures/machinery/floodlight.dmi b/icons/obj/structures/machinery/floodlight.dmi index 7330d1749ab7e7b5e5dc2339c5f05aa9de8c5459..1f6b3b3d6d4c22e4aec4bbf9f5cff599c37a963d 100644 GIT binary patch delta 3115 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 delta 1386 zcmV-w1(o`<8G#It8Gi!+0082oihBS60GUusR7JqRz#JMGF)=Z2X$XOP1v4%vKRGfW zARvdZt)kJ+#pB^SJ3B{5M^#l-Sx`q#Mm?$(6?GgO@F);iR0tv=AxK39DJ3Alz`$Bs zS}Q9nNl8g(XJy-5IJ z3no)0y5|f}5y*|n&HI8pLMHjY2<^(vaYARa`Mf!L1~81H!vnDT=o`Q+PUvEJkwwn{ zhH*lde{rdPdj=Sde_5?oU#j1`5Li7vKCXYN-#?Rp$^>_JLN03ypDT&PATB$tttWKo z2XBGfYcBRs4}-YO&$cte@6543r0WKMdV0EwfAar?&XRxMf*a zac<{N{9ksk(BYXrql48ufYl5zj7tK){C`3pmbMMuIL~X~&dj!#53~P}}zIgoIkP@Dm05DVa(@O2QZ8yUN@Vo0~p2;ubY>v0~p4K&+}i|qcf#MYzaRU!R_xzZ zV!A${oZno1KsmK;ePC#OReeB7K({_HG`^}nphZBZJ}@-Csy?73pj#gp8eh48R}nB> zA5ao7T^~>qxK({XNyK!0KuN%KeLzXTbbUZcz;t~;Nx*b{KuN%KeLzXTbbWt7NnolE zOftzNpAvWL?mT?Ad)IRbj{Vl#x%h5fiF>Zczn)v+;+lW;aHVVyeh?g3z>Yo(NWlCf zt`9-rAGQMb0u}@~7=+{eBwIX*hfx^fh#(=6C)wiZ5!kVR8eyb;vy&4H;uV4DM}+`+j@S{mRB?hxQA(bj;+{KFB3Z#BUkjt9TCu`oL#@FL=#H9o-2 zjtIPnxQ}#w;O^oH_xC$1^hGdKE0js7s{x^vOCl0E=pvy^M!I=`CEN*LTTQRr2@_V? zm6$Ni_`VIj^ z!JBpz?2jpeKK5HpKJL@>Smgm|peGM>G|-a=^flo5SZ#VnrmG%C$aH74Bz_$QFhR~U zVf`>dCd|1B>L`E-N}dVphY>Pi$xWc`18I^V_hQvZ2JDP8GIM{DG%I8Z{SbN~PV07*qoM6N<$f-tahH~;_u