cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Borg Push Broom Icon Updates When Braced (#31255)

Browse Source 
* 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>
This commit is contained in:
CRUNCH
2025-12-27 09:35:27 +00:00
committed by GitHub
parent a590870d00
commit ee13dce3e1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_items.dm
+5
View File
@@ -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)
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -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."))