cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed monk staffs not displaying a wielded sprite (#85767)

Browse Source 
## About The Pull Request

Closes #85764

## Changelog
🆑
fix: Fixed monk staffs not displaying a wielded sprite
/🆑
This commit is contained in:
SmArtKar
2024-08-14 12:19:01 +02:00
committed by GitHub
parent e3dbbccf8f
commit ac750f358f
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/sleeping_carp.dm
+1 -2
View File
@@ -263,11 +263,10 @@
AddComponent(/datum/component/two_handed, \
force_unwielded = 10, \
force_wielded = 24, \
icon_wielded = "[base_icon_state]1", \
)
/obj/item/staff/bostaff/update_icon_state()
icon_state = "[base_icon_state]0"
icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()
/obj/item/staff/bostaff/attack(mob/target, mob/living/user, params)
code/game/objects/items/weaponry.dm
+1 -2
View File
@@ -529,11 +529,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
AddComponent(/datum/component/two_handed, \
force_unwielded = 10, \
force_wielded = 14, \
icon_wielded = "[base_icon_state]1", \
)
/obj/item/bambostaff/update_icon_state()
icon_state = "[base_icon_state]0"
icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()
/obj/item/cane
code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
+1 -2
View File
@@ -586,11 +586,10 @@
AddComponent(/datum/component/two_handed, \
force_unwielded = 14, \
force_wielded = 18, \
icon_wielded = "[base_icon_state]1", \
)
/obj/item/nullrod/bostaff/update_icon_state()
icon_state = "[base_icon_state]0"
icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()