From 3ad79c5d79cdf1f3db8f44765bfe70499cdf23a6 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:00:19 +0000 Subject: [PATCH 1/4] reparent medals so moffs don't eat them --- .../Entities/Clothing/Neck/medals.yml | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 51b1fb56936..37febb59428 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -1,6 +1,14 @@ - - type: entity parent: ClothingNeckBase + id: ClothingNeckMedalBase + abstract: true + name: medal + description: not given to anyone + components: + - tags: null + +- type: entity + parent: ClothingNeckMedalBase id: ClothingNeckBronzeheart name: bronzeheart medal description: Given to crewmates for exemplary bravery in the face of danger. @@ -11,7 +19,7 @@ sprite: Clothing/Neck/Medals/bronzeheart.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckGoldmedal name: gold medal of crewmanship description: Given to crewmates who display excellent crewmanship. @@ -24,7 +32,7 @@ stealGroup: ClothingNeckGoldmedal - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckCargomedal name: logistics medal # DeltaV - Logistics Department replacing Cargo description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo. Updated description for flavour @@ -35,7 +43,7 @@ sprite: DeltaV/Clothing/Neck/Medals/cargomedal.rsi # DeltaV - resprite - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckEngineermedal name: engineer medal description: Whether it's by keeping the crew breathing, meticulous rewiring and upgrading, or just having plenty of materials on-hand - this medal is to be assigned only for the best work in the engineering department. # DeltaV - Updated description for flavour @@ -46,7 +54,7 @@ sprite: DeltaV/Clothing/Neck/Medals/engineermedal.rsi # DeltaV - resprite - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckMedicalmedal name: medical medal description: Whether it's being the first on the scene of an accident, the most caring bedside manner, or just making sure the patients don't go mad - this medal is to be assigned only for the best work in the medical department. # DeltaV - Updated description for flavour @@ -57,7 +65,7 @@ sprite: DeltaV/Clothing/Neck/Medals/medicalmedal.rsi # DeltaV - resprite - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckSciencemedal name: epistemics medal # DeltaV - Epistemics Department replacing Science description: Whether it's pushing the edges of modern science and technology, foraying into the vast expanses of the noosphere, or just fetching the coffee - this medal is to be assigned only for the best work in the epistemics department. # DeltaV - Epistemics Department replacing Science. Updated description for flavour @@ -68,7 +76,7 @@ sprite: DeltaV/Clothing/Neck/Medals/sciencemedal.rsi # DeltaV - resprite - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckSecuritymedal name: security medal description: Whether it's catching armed terrorists, guarding the crew from alien threats, or just having a conversation in the corridor - this medal is to be assigned only for the best work in the security department. # DeltaV - Updated description for flavour @@ -79,7 +87,7 @@ sprite: DeltaV/Clothing/Neck/Medals/securitymedal.rsi # DeltaV - resprite - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckClownmedal name: bravado medal # DeltaV - Updated title so it's not just a joke medal. description: Given to crewmates who laugh in the face of death, lift their peers' spirits, and uplift themselves and their friends to success. # DeltaV - Updated description for flavour and to reflect title. From f5ceeb6efe58cb626d8c4c1f9041fb0c2b56606e Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:03:10 +0000 Subject: [PATCH 2/4] add chameleon tag back --- Resources/Prototypes/Entities/Clothing/Neck/medals.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 37febb59428..a5ae51da9b2 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -5,7 +5,8 @@ name: medal description: not given to anyone components: - - tags: null + - type: Tag + - WhitelistChameleon - type: entity parent: ClothingNeckMedalBase From 366af7f20b4846848f4abe672719f1fdbcc3a5c9 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:03:18 +0000 Subject: [PATCH 3/4] reparents Delta's medal --- Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml index 1094cab4f72..b516135040b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMedalBase id: ClothingNeckBlackStar name: black star medal description: Given to crewmates that make the greatest of sacrifices in the performance of their duties. From 72bf70a81ff5a1c75ff34ff66ae366a0496ceb57 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Tue, 19 Mar 2024 21:20:55 +0000 Subject: [PATCH 4/4] Update medals.yml --- Resources/Prototypes/Entities/Clothing/Neck/medals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index a5ae51da9b2..e76a4b3ee3b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -6,6 +6,7 @@ description: not given to anyone components: - type: Tag + tags: - WhitelistChameleon - type: entity