From 97d4525ce7bbb71fb5d41b906a9ccf2ca0475883 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:01:20 -0400 Subject: [PATCH] new dropwall sprites from TG, fix dropwall timer (#26063) * new dropwall sprites from TG, fix dropwall timer * improves icon further --- code/game/machinery/deployable.dm | 17 ++++++++--------- icons/obj/dropwall.dmi | Bin 2995 -> 3403 bytes 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 4b268eb07c4..cea8c0cdbe6 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -261,7 +261,7 @@ directional_list += dir_1 directional_list += dir_2 if(dir_2) - icon_state = "[dir2text(dir_1 + dir_2)]" + icon_state = "[dir2text(dir_1)][dir2text(dir_1 + dir_2)]" else icon_state = "[dir2text(dir_1)]" @@ -358,7 +358,7 @@ anchored = TRUE protected = TRUE addtimer(CALLBACK(src, PROC_REF(power_out)), uptime) - timer_overlay_proc(uptime/10) + timer_overlay_proc(1) connected_shields += new barricade_type(get_turf(loc), src, TRUE, direction) core_shield = connected_shields[1] @@ -406,13 +406,12 @@ new /obj/item/used_dropwall(get_turf(src)) qdel(src) -/obj/structure/dropwall_generator/proc/timer_overlay_proc(uptime) // This proc will make the timer on the generator tick down like a clock, over 12 equally sized portions (12 times over 12 seconds, every second by default) - var/cycle = DROPWALL_UPTIME + 1 - uptime - add_overlay("[cycle]") - if(cycle != 1) - cut_overlay("[(cycle - 1)]") - if(cycle < 12) - addtimer(CALLBACK(src, PROC_REF(timer_overlay_proc), uptime - 1), DROPWALL_UPTIME / 12 SECONDS) +/obj/structure/dropwall_generator/proc/timer_overlay_proc(loops) // This proc will make the timer on the generator tick down like a clock, over 12 equally sized portions (12 times over 60 seconds, every 5 seconds by default) + add_overlay("[loops]") + if(loops != 1) + cut_overlay("[(loops - 1)]") + if(loops < 12) + addtimer(CALLBACK(src, PROC_REF(timer_overlay_proc), loops + 1), DROPWALL_UPTIME / 12) /obj/item/used_dropwall diff --git a/icons/obj/dropwall.dmi b/icons/obj/dropwall.dmi index e8f93cb03bd5732a9a7d12d975730bf119922240..083ddd20f04bd84c3bc0e1f5b3d7c4bd90b3482b 100644 GIT binary patch literal 3403 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 bASpDr*vqKCKt@n}l9XHzc{n|FK&Jc^#($4I literal 2995 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