From ee13dce3e16b07335d268ecdc1ce8fed4af3b2b3 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Sat, 27 Dec 2025 09:35:27 +0000 Subject: [PATCH] Borg Push Broom Icon Updates When Braced (#31255) * broom * Apply suggestions from code review Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> * Update code/game/objects/items/robot/robot_items.dm Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/items/robot/robot_items.dm | 5 +++++ code/game/objects/items/weapons/twohanded.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index b0627d86014..dbb9892b35f 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -63,8 +63,12 @@ Keeping it in for adminabuse but the malf one is /obj/item/melee/baton/borg_stun UnregisterSignal(user, COMSIG_MOVABLE_MOVED) UnregisterSignal(src, COMSIG_CYBORG_ITEM_DEACTIVATED) braced = !braced + update_icon(UPDATE_ICON_STATE) return ITEM_INTERACT_COMPLETE +/obj/item/borg/push_broom/update_icon_state() + icon_state = "[base_icon_state][braced]" + /obj/item/borg/push_broom/interact_with_atom(atom/target, mob/living/user, list/modifiers) // Can we sweep it? No? Violence is the solution. if(!isitem(target) && !isturf(target)) @@ -76,6 +80,7 @@ Keeping it in for adminabuse but the malf one is /obj/item/melee/baton/borg_stun /obj/item/borg/push_broom/proc/stow_broom(datum/source, mob/user) SIGNAL_HANDLER // COMSIG_CYBORG_ITEM_DEACTIVATED braced = FALSE + update_icon(UPDATE_ICON_STATE) to_chat(user, SPAN_NOTICE("You unbrace [src] and stow it away.")) UnregisterSignal(user, COMSIG_MOVABLE_MOVED) UnregisterSignal(src, COMSIG_CYBORG_ITEM_DEACTIVATED) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index eb3eefa8072..260ce384222 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -780,7 +780,7 @@ unwield_callback = CALLBACK(src, PROC_REF(unwield))) /obj/item/push_broom/update_icon_state() - icon_state = "broom0" + icon_state = "[base_icon_state]0" /obj/item/push_broom/proc/wield(obj/item/source, mob/user) to_chat(user, SPAN_NOTICE("You brace [src] against the ground in a firm sweeping stance."))