From bc2fe23c9fe83498b0ddf11ed885c5e13820ed98 Mon Sep 17 00:00:00 2001 From: Guloveos Date: Fri, 10 Jan 2025 16:57:14 -0700 Subject: [PATCH 1/4] Fixes the flesh cult armor --- .../_Arc/Entities/Clothing/Head/helmets.yml | 42 +++++++++++++++++++ .../Entities/Clothing/OuterClothing/armor.yml | 6 +-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml index e69de29bb2d1d6..39010d424ab472 100644 --- a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml @@ -0,0 +1,42 @@ +- type: entity + + id: ClothingHeadHelmetFlesh + name: Flesh cult helmet + description: A boon from the one true deity, the flesh god. It's a helmet made of flesh. + components: + - type: BreathMask + - type: Sprite + sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi + state: icon + - type: Clothing + sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi +# equipSound: /Audio/Mecha/mechmove03.ogg +# unequipSound: /Audio/Mecha/mechmove03.ogg + quickEquip: false + slots: [ HEAD ] + - type: Item + size: Normal + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + - type: Clickable + - type: InteractionOutline + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + - type: GroupExamine + - type: Tag + tags: + - WhitelistChameleon + - type: IdentityBlocker + - type: HideLayerClothing + slots: + - Snout diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Arc/Entities/Clothing/OuterClothing/armor.yml index 0c9ddfa706c074..300d49c56a54ea 100644 --- a/Resources/Prototypes/_Arc/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Arc/Entities/Clothing/OuterClothing/armor.yml @@ -23,9 +23,9 @@ - type: HeldSpeedModifier - type: StaminaDamageResistance coefficient: 0.7 - # - type: ToggleableClothing - # slot: head - # clothingPrototype: ClothingHeadHelmetFlesh + - type: ToggleableClothing + slot: head + clothingPrototype: ClothingHeadHelmetFlesh - type: Tag tags: - Hardsuit From 2096c68b8d5f40e28aa166d6d5751a8d7079e10e Mon Sep 17 00:00:00 2001 From: Guloveos Date: Sun, 12 Jan 2025 22:25:08 -0700 Subject: [PATCH 2/4] Update Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml Co-authored-by: TheDoctor1977 <108845723+TheDoctor1977@users.noreply.github.com> --- Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml index 39010d424ab472..c0ee7c26a4a0e8 100644 --- a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml @@ -1,7 +1,7 @@ - type: entity id: ClothingHeadHelmetFlesh - name: Flesh cult helmet + name: flesh cult helmet description: A boon from the one true deity, the flesh god. It's a helmet made of flesh. components: - type: BreathMask From a9ac128e409b68f7caca0f03a8e9808c74ea1848 Mon Sep 17 00:00:00 2001 From: Guloveos Date: Sun, 12 Jan 2025 22:25:17 -0700 Subject: [PATCH 3/4] Update Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml Co-authored-by: TheDoctor1977 <108845723+TheDoctor1977@users.noreply.github.com> --- Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml index c0ee7c26a4a0e8..f99bf9535309d5 100644 --- a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml @@ -2,7 +2,7 @@ id: ClothingHeadHelmetFlesh name: flesh cult helmet - description: A boon from the one true deity, the flesh god. It's a helmet made of flesh. + description: A boon from the one true deity, Carnemori. It's a helmet made of flesh. components: - type: BreathMask - type: Sprite From 404d18aba43b5f3e88e651bed39785bf95206e4e Mon Sep 17 00:00:00 2001 From: Guloveos Date: Sun, 12 Jan 2025 22:57:30 -0700 Subject: [PATCH 4/4] Fixed a spelling mistake --- .../_Arc/Entities/Clothing/Head/helmets.yml | 4 ++-- .../equipped-HELMET.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Textures/_Arc/Clothing/Head/Helmets/{Flesh_cult_helment.rsi => Flesh_cult_helmet.rsi}/equipped-HELMET.png (100%) rename Resources/Textures/_Arc/Clothing/Head/Helmets/{Flesh_cult_helment.rsi => Flesh_cult_helmet.rsi}/icon.png (100%) rename Resources/Textures/_Arc/Clothing/Head/Helmets/{Flesh_cult_helment.rsi => Flesh_cult_helmet.rsi}/inhand-left.png (100%) rename Resources/Textures/_Arc/Clothing/Head/Helmets/{Flesh_cult_helment.rsi => Flesh_cult_helmet.rsi}/inhand-right.png (100%) rename Resources/Textures/_Arc/Clothing/Head/Helmets/{Flesh_cult_helment.rsi => Flesh_cult_helmet.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml index 39010d424ab472..4a6d9f601727a3 100644 --- a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml @@ -6,10 +6,10 @@ components: - type: BreathMask - type: Sprite - sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi + sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi state: icon - type: Clothing - sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi + sprite: /Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi # equipSound: /Audio/Mecha/mechmove03.ogg # unequipSound: /Audio/Mecha/mechmove03.ogg quickEquip: false diff --git a/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/equipped-HELMET.png b/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/equipped-HELMET.png rename to Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/icon.png b/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/icon.png similarity index 100% rename from Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/icon.png rename to Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/icon.png diff --git a/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/inhand-left.png b/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/inhand-left.png rename to Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/inhand-left.png diff --git a/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/inhand-right.png b/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/inhand-right.png rename to Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/inhand-right.png diff --git a/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/meta.json b/Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/meta.json similarity index 100% rename from Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helment.rsi/meta.json rename to Resources/Textures/_Arc/Clothing/Head/Helmets/Flesh_cult_helmet.rsi/meta.json