From 0ba3341a5016ab52aba0bca80319cdb183f74119 Mon Sep 17 00:00:00 2001 From: Coolsurf6 Date: Mon, 21 Oct 2024 23:46:14 +1000 Subject: [PATCH 1/3] added upgraded armour and kit, changed wearable tc amounts --- Resources/Locale/en-US/_SSS/store_items.ftl | 3 ++ .../Prototypes/_SSS/Catalog/sss_uplink.yml | 26 +++++++++++++-- .../Prototypes/_SSS/Objects/store_items.yml | 15 +++++++++ .../_SSS/Objects/suspicion_clothing.yml | 32 +++++++++++++++++++ .../Graphs/Clothing/suspicion_clothing.yml | 13 ++++++++ Resources/Prototypes/_SSS/tags.yml | 2 ++ 6 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_SSS/Recipes/Construction/Graphs/Clothing/suspicion_clothing.yml create mode 100644 Resources/Prototypes/_SSS/tags.yml diff --git a/Resources/Locale/en-US/_SSS/store_items.ftl b/Resources/Locale/en-US/_SSS/store_items.ftl index 7a0583ef77..a3d19217e1 100644 --- a/Resources/Locale/en-US/_SSS/store_items.ftl +++ b/Resources/Locale/en-US/_SSS/store_items.ftl @@ -1,2 +1,5 @@ uplink-carp-box-name = Dehydrated Carp Box uplink-carp-box-desc = Box filled with 4 dehydrated carps. Make sure your friends pet it as well! + +uplink-armour-upgrade-name = Armour Upgrade Kit +uplink-armour-upgrade-desc = An armour upgrade kit. Use on your armour to upgrade the protection. Armour will drop if equipped! diff --git a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml index 887d588245..d1e3326ee1 100644 --- a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml +++ b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml @@ -328,7 +328,7 @@ description: uplink-clothing-no-slips-shoes-desc productEntity: ClothingShoesChameleonNoSlips cost: - Telecrystal: 4 + Telecrystal: 2 categories: - SSSTraitorWearables @@ -338,7 +338,7 @@ description: uplink-clothing-shoes-boots-mag-syndie-desc productEntity: ClothingShoesBootsMagSyndie cost: - Telecrystal: 4 + Telecrystal: 1 categories: - SSSTraitorWearables @@ -349,7 +349,17 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle cost: - Telecrystal: 8 + Telecrystal: 3 + categories: + - SSSTraitorWearables + +- type: listing + id: UplinkArmourUpgradeKitSSS + name: uplink-armour-upgrade-name + description: uplink-armour-upgrade-desc + productEntity: ClothingOuterVestWebMercSuspicionUpgradeKit + cost: + Telecrystal: 3 categories: - SSSTraitorWearables @@ -388,3 +398,13 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 + +- type: listing + id: UplinkArmourUpgradeKitSSSDetective + name: uplink-armour-upgrade-name + description: uplink-armour-upgrade-desc + productEntity: ClothingOuterVestWebMercSuspicionUpgradeKit + cost: + Telecrystal: 2 + categories: + - SSSDetectiveWearables diff --git a/Resources/Prototypes/_SSS/Objects/store_items.yml b/Resources/Prototypes/_SSS/Objects/store_items.yml index dda811146e..2fc94e15a9 100644 --- a/Resources/Prototypes/_SSS/Objects/store_items.yml +++ b/Resources/Prototypes/_SSS/Objects/store_items.yml @@ -30,3 +30,18 @@ reagents: - ReagentId: Water Quantity: 30 + +- type: entity + name: Armour Upgrade Kit + parent: [BaseItem, BaseSyndicateContraband] + id: ClothingOuterVestWebMercSuspicionUpgradeKit + description: An armour upgrade kit. Use on your armour to upgrade the protection. Armour will drop if equipped! + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: abductor_mod # temp - new item might be better but for now this will work + - type: Item + size: Small + - type: Tag + tags: + - ClothingOuterVestWebMercSuspicionUpgradeKit diff --git a/Resources/Prototypes/_SSS/Objects/suspicion_clothing.yml b/Resources/Prototypes/_SSS/Objects/suspicion_clothing.yml index d252451e00..2f1d98c33f 100644 --- a/Resources/Prototypes/_SSS/Objects/suspicion_clothing.yml +++ b/Resources/Prototypes/_SSS/Objects/suspicion_clothing.yml @@ -33,6 +33,38 @@ - type: entity parent: ClothingOuterVestWebMerc id: ClothingOuterVestWebMercSuspicion + suffix: SSS + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 # 30% to 10% resistance, Blunt and Slash are underused damage types, increased viability for Melee + Slash: 0.9 + Piercing: 0.7 # 50% to 30% resistance, giving a path for upgradable armour. Fine tune this value as it could be 20% instead. + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 # Leaving this incase we want to modify it. + - type: Construction + graph: UpgradeClothingOuterVestWebMercSuspicion + node: start + +- type: entity + parent: ClothingOuterVestWebMercSuspicion + id: ClothingOuterVestWebMercSuspicionUpgraded + suffix: SSS-Upgraded + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.5 # 30% back to 50%, weaker to the base game bulletproofvest + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.8 # 10% to 20%, equivilent to the base game bulletproofvest + - type: Construction + graph: UpgradeClothingOuterVestWebMercSuspicion + node: upgraded - type: entity parent: HoPIDCard diff --git a/Resources/Prototypes/_SSS/Recipes/Construction/Graphs/Clothing/suspicion_clothing.yml b/Resources/Prototypes/_SSS/Recipes/Construction/Graphs/Clothing/suspicion_clothing.yml new file mode 100644 index 0000000000..5e986bdf0e --- /dev/null +++ b/Resources/Prototypes/_SSS/Recipes/Construction/Graphs/Clothing/suspicion_clothing.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: UpgradeClothingOuterVestWebMercSuspicion + start: start + graph: + - node: start + edges: + - to: upgraded + steps: + - tag: ClothingOuterVestWebMercSuspicionUpgradeKit + doAfter: 4 + + - node: upgraded + entity: ClothingOuterVestWebMercSuspicionUpgraded diff --git a/Resources/Prototypes/_SSS/tags.yml b/Resources/Prototypes/_SSS/tags.yml new file mode 100644 index 0000000000..beffb47f60 --- /dev/null +++ b/Resources/Prototypes/_SSS/tags.yml @@ -0,0 +1,2 @@ +- type: Tag + id: ClothingOuterVestWebMercSuspicionUpgradeKit From af778919f83671c80749419a1b46107a5fbc412b Mon Sep 17 00:00:00 2001 From: Coolsurf6 Date: Tue, 22 Oct 2024 00:00:27 +1000 Subject: [PATCH 2/3] made armour a one time purchase --- Resources/Prototypes/_SSS/Catalog/sss_uplink.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml index d1e3326ee1..0beb3470dc 100644 --- a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml +++ b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml @@ -362,6 +362,9 @@ Telecrystal: 3 categories: - SSSTraitorWearables + conditions: + - !type:ListingLimitedStockCondition + stock: 1 - type: listing id: UplinkClothingOuterHardsuitJuggernautSSS @@ -408,3 +411,6 @@ Telecrystal: 2 categories: - SSSDetectiveWearables + conditions: + - !type:ListingLimitedStockCondition + stock: 1 From 3a5d37d66e20137fadb914e000b351ea3ad277ef Mon Sep 17 00:00:00 2001 From: Simyon264-Bot Date: Mon, 21 Oct 2024 18:40:51 +0200 Subject: [PATCH 3/3] Automatic changelog update --- Resources/Changelog/Suspicion.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Changelog/Suspicion.yml b/Resources/Changelog/Suspicion.yml index 3dfd9602cf..0a51d5b9a1 100644 --- a/Resources/Changelog/Suspicion.yml +++ b/Resources/Changelog/Suspicion.yml @@ -65,3 +65,18 @@ id: 6 time: '2024-10-21T09:20:35.0000000+00:00' url: https://github.com/Simyon264/Suspicion-on-Space-Station/pull/9 +- author: Coolsurf6 + changes: + - message: Armour Upgrade Kit for Detectives (2TC) and Terrorists (3TC) + type: Add + - message: Starting Armour Vest is now 20% Pierce and 10% Blunt/Slash + type: Tweak + - message: Syndicate Hardsuit Price is now 3TC from 8TC + type: Tweak + - message: No Slips is now 2TC from 4TC + type: Tweak + - message: Syndicate MagBoots is now 1TC from 4TC + type: Tweak + id: 7 + time: '2024-10-21T16:39:47.0000000+00:00' + url: https://github.com/Simyon264/Suspicion-on-Space-Station/pull/10