Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fixes action_type on clothing to be a list on two i…
Browse files Browse the repository at this point in the history
…tems that where static (#1524) (#2474)

* [NO GBP] Fixes action_type on clothing to be a list on two items that where static (#82075)

## About The Pull Request

This changes the action_types on the face scarf from being a static
datum to being a list. This is a bug I noticed while working on a PR
downstream where i was attempting to add an action to a set of items and
this caused a miss-matched type CI error. This realistically shouldn't
be the case as everything else on the code base that uses action_types
is also a list. So for consistency sake and to remove bugs this will fix
the var to be a list instead of static.

## Why It's Good For The Game

Less bugs, more consistency with variables.

## Changelog

I don't really think this needs a change log, not really player
noticeable or player facing. The relative impact on players is minor

* [NO GBP] Fixes action_type on clothing to be a list on two items that where static

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
  • Loading branch information
3 people authored Mar 20, 2024
1 parent 5669f99 commit df70b6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

/obj/item/clothing/Initialize(mapload)
if(clothing_flags & VOICEBOX_TOGGLABLE)
actions_types += /datum/action/item_action/toggle_voice_box
actions_types += list(/datum/action/item_action/toggle_voice_box)
. = ..()
AddElement(/datum/element/venue_price, FOOD_PRICE_CHEAP)
if(can_be_bloody && ((body_parts_covered & FEET) || (flags_inv & HIDESHOES)))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/masks/bandana.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
/obj/item/clothing/mask/facescarf
name = "facescarf"
desc = "Cover your face like in the cowboy movies. It also has breathtube so you can wear it everywhere!"
actions_types = /datum/action/item_action/adjust
actions_types = list(/datum/action/item_action/adjust)
icon_state = "facescarf"
inhand_icon_state = "greyscale_facescarf"
alternate_worn_layer = BACK_LAYER
Expand Down

0 comments on commit df70b6d

Please sign in to comment.