From a23dda4c3ab81cf474209f178ac538d3c63a35b9 Mon Sep 17 00:00:00 2001 From: Nomoresolvalou Date: Wed, 6 Nov 2024 10:49:31 -0600 Subject: [PATCH] Pred bones can now go on armor (#7504) # 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
Screenshots & Videos Bone on top of armor ![image](https://github.com/user-attachments/assets/c47079ae-3c25-4fc7-941d-a3ace952c191)
# 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: --- code/__DEFINES/equipment.dm | 1 + code/modules/cm_preds/yaut_items.dm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 474cd8ca4e09..3d07a7abe9a7 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -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" diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index a2c36d979072..06600ca55645 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -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 @@ -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 @@ -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