mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
You can put the surplus energy sword on your belt slot (nmh larp?) (#96619)
## About The Pull Request When the surplus energy sword is inactive you can put it into your belt slot. There is a worn sprite for it now as well to accommodate this, shown in the video below as well as the active check. https://github.com/user-attachments/assets/59c2e404-b6d7-4125-a207-582697da351c ## Why It's Good For The Game It's a expensive and powerful black market item, it's cool to be able to show it off without having to wave it around in people's faces. Belt slot is valuable real estate already; i don't see any issues with letting it hold a tiny item, and you can't leave it active while on your belt. ## Changelog 🆑 qol: you can put the surplus esword onto your belt image: updated belt.dmi with worn sprites for the surplus esword /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
co-authored by
Ghom
parent
79fa0b8ecd
commit
5c39729e09
@@ -125,7 +125,6 @@
|
||||
else
|
||||
heat = initial(heat)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
tool_behaviour = (active ? TOOL_SAW : NONE) //Lets energy weapons cut trees. Also lets them do bonecutting surgery, which is kinda metal!
|
||||
if(user)
|
||||
balloon_alert(user, "[name] [active ? "enabled":"disabled"]")
|
||||
@@ -410,6 +409,9 @@
|
||||
alt_sharpness = NONE
|
||||
alt_force_mod = -12
|
||||
alt_hitsound = SFX_SWING_HIT
|
||||
worn_icon_state = "energysurplus"
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
light_color = LIGHT_COLOR_LIGHT_CYAN
|
||||
/// Battery used to determine how many hits we can make before our sword switches off and can't be turned back on without a do_after.
|
||||
var/charge = 20
|
||||
/// Our battery maximum.
|
||||
@@ -548,6 +550,13 @@
|
||||
COOLDOWN_START(src, jiggle_cooldown, 1 SECONDS)
|
||||
return TRUE
|
||||
|
||||
/obj/item/melee/energy/sword/surplus/on_transform(obj/item/source, mob/user, active)
|
||||
. = ..()
|
||||
if(active)
|
||||
slot_flags &= ~ITEM_SLOT_BELT
|
||||
else
|
||||
slot_flags |= ITEM_SLOT_BELT
|
||||
|
||||
// Null rod variants
|
||||
|
||||
/obj/item/melee/energy/sword/nullrod
|
||||
|
||||
Reference in New Issue
Block a user