From c884ecd074e65fe16a1d01fc6b2bdacea1a4f6a4 Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:00:04 +0200 Subject: [PATCH] Add acolyte armor to chaplain uplink (#36843) --- .../Locale/en-US/store/uplink-catalog.ftl | 3 +++ .../Catalog/Fills/Backpacks/duffelbag.yml | 13 +++++++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 18 ++++++++++++++++++ .../Entities/Clothing/Back/duffel.yml | 10 +++++++++- .../Entities/Clothing/OuterClothing/armor.yml | 2 +- 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 066ac4376d..90cce4c68a 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -492,3 +492,6 @@ uplink-contraband-lighter-desc = A mystery box guaranteed to contain a syndicate uplink-smuggler-satchel-name = Smuggler's Satchel uplink-smuggler-satchel-desc = A handy, suspicious looking satchel. Just flat enough to fit underneath floor tiles. + +uplink-acolyte-armor-name = Acolyte Armor +uplink-acolyte-armor-desc = The must have of any self respecting cult leader. An evil looking piece of armor, made of bones, and surprisingly resistant to damage. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 62ca952db7..49c49e746d 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -337,6 +337,19 @@ - id: SyndieTrickyBomb amount: 2 +- type: entity + parent: [ ClothingBackpackDuffelBundle, BaseMajorContraband ] + id: ClothingBackpackDuffelAcolyteBundle + name: acolyte armor bundle + description: "Contains the Acolyte Armor, the must have of any cult leader." + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorCult + - id: ClothingHeadHelmetCult + - id: ClothingShoesCult + - id: BedsheetCult + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledStarterKit diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c94306cdc1..ebeae71d99 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2257,6 +2257,24 @@ categories: - UplinkDeception +- type: listing + id: UplinkAcolyteArmor + name: uplink-acolyte-armor-name + description: uplink-acolyte-armor-desc + icon: { sprite: Clothing/OuterClothing/Armor/cult_armour.rsi, state: icon} + productEntity: ClothingBackpackDuffelAcolyteBundle + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 4 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chaplain + - type: listing id: UplinkSawAdvanced name: uplink-saw-advanced-name diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 52277a5d85..2e76976443 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -173,13 +173,21 @@ - 0,0,8,4 - type: entity - parent: ClothingBackpackDuffelSyndicate + parent: [ ClothingBackpackDuffelSyndicate, BaseSyndicateContraband ] id: ClothingBackpackDuffelSyndicateBundle abstract: true components: - type: Tag tags: [] # ignore "WhitelistChameleon" tag +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBundle + abstract: true + components: + - type: Tag + tags: [] # ignore "WhitelistChameleon" tag + - type: entity parent: ClothingBackpackDuffelSyndicate id: ClothingBackpackDuffelSyndicateAmmo diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 5efd60eae7..a345622d85 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -342,7 +342,7 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.6 + Piercing: 0.5 Heat: 0.5 - type: GroupExamine