Skip to content

Commit

Permalink
Pred bones can now go on armor (#7504)
Browse files Browse the repository at this point in the history
# About the pull request



Yautja can now place the bone trophy ornaments on your armor instead of
only your body mesh uniform

# Explain why it's good for the game

Since you could only place the bone accessory on your mesh, it meant
that it couldn't be seen if you had armor over it. Now you can place the
bones on your armor instead and have it shown. If you still want to put
it on your mesh so that it is only seen with the armor off, you can
still do that too.


# Testing Photographs and Procedure


<details>
<summary>Screenshots & Videos</summary>
Bone on top of armor


![image](https://github.com/user-attachments/assets/c47079ae-3c25-4fc7-941d-a3ace952c191)


</details>


# Changelog
:cl: Nomoresolvalou
add: Hunters can now put their bone trophies on their armor to have it
show up there instead of on their mesh.

/:cl:
  • Loading branch information
Nomoresolvalou authored Nov 6, 2024
1 parent 21cbf88 commit a23dda4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
#define ACCESSORY_SLOT_DECOR "Decor"
#define ACCESSORY_SLOT_MEDAL "Medal"
#define ACCESSORY_SLOT_PONCHO "Ponchos"
#define ACCESSORY_SLOT_TROPHY "Trophy"

/// Used for uniform armor inserts.
#define ACCESSORY_SLOT_ARMOR_C "Chest armor"
Expand Down
4 changes: 3 additions & 1 deletion code/modules/cm_preds/yaut_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
)
unacidable = TRUE
item_state_slots = list(WEAR_JACKET = "halfarmor1")
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M, ACCESSORY_SLOT_TROPHY)
var/thrall = FALSE//Used to affect icon generation.
fire_intensity_resistance = 10
black_market_value = 100
Expand Down Expand Up @@ -290,6 +290,7 @@
/obj/item/clothing/under/chainshirt/hunter
name = "body mesh"
desc = "A set of very fine chainlink in a meshwork for comfort and utility."
valid_accessory_slots = list(ACCESSORY_SLOT_TROPHY)

armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_MEDIUM
Expand Down Expand Up @@ -995,6 +996,7 @@
icon = 'icons/obj/items/skeleton.dmi'
accessory_icons = list(WEAR_BODY = 'icons/mob/humans/onmob/hunter/pred_gear.dmi')
icon_state = null
slot = ACCESSORY_SLOT_TROPHY
///Has it been cleaned by a polishing rag?
var/polished = FALSE

Expand Down

0 comments on commit a23dda4

Please sign in to comment.