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 diff --git a/Resources/Locale/en-US/_SSS/store_items.ftl b/Resources/Locale/en-US/_SSS/store_items.ftl index 7e99d1f2aa..10b1fdec91 100644 --- a/Resources/Locale/en-US/_SSS/store_items.ftl +++ b/Resources/Locale/en-US/_SSS/store_items.ftl @@ -5,3 +5,5 @@ uplink-disruptive-throwable-name = Disruptive Grenade Kit uplink-disruptive-throwable-desc = A set of 1 flash, smoke and stinger grenades. Perfect for slowing down and getting away. uplink-exploding-syndicate-bomb-SSS-desc = A big, anchored bomb that can create a huge explosion if not defused in time. Useful as a distraction. Has an adjustable timer with a minimum setting of 90 seconds. Stays quiet for 30 seconds upon activation. +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! \ No newline at end of file diff --git a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml index c5ca4bd4ae..3898459bd3 100644 --- a/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml +++ b/Resources/Prototypes/_SSS/Catalog/sss_uplink.yml @@ -318,7 +318,7 @@ description: uplink-clothing-no-slips-shoes-desc productEntity: ClothingShoesChameleonNoSlips cost: - Telecrystal: 4 + Telecrystal: 2 categories: - SSSTraitorWearables @@ -328,7 +328,7 @@ description: uplink-clothing-shoes-boots-mag-syndie-desc productEntity: ClothingShoesBootsMagSyndie cost: - Telecrystal: 4 + Telecrystal: 1 categories: - SSSTraitorWearables @@ -339,10 +339,23 @@ 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 + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + - type: listing id: UplinkClothingOuterHardsuitJuggernautSSS name: uplink-clothing-outer-hardsuit-juggernaut-name @@ -388,3 +401,16 @@ - SSSDetectiveExplosives cost: Telecrystal: 1 + +- type: listing + id: UplinkArmourUpgradeKitSSSDetective + name: uplink-armour-upgrade-name + description: uplink-armour-upgrade-desc + productEntity: ClothingOuterVestWebMercSuspicionUpgradeKit + cost: + Telecrystal: 2 + categories: + - SSSDetectiveWearables + conditions: + - !type:ListingLimitedStockCondition + stock: 1 diff --git a/Resources/Prototypes/_SSS/Objects/store_items.yml b/Resources/Prototypes/_SSS/Objects/store_items.yml index 1b8b3dc1f1..94c4c8bfbb 100644 --- a/Resources/Prototypes/_SSS/Objects/store_items.yml +++ b/Resources/Prototypes/_SSS/Objects/store_items.yml @@ -59,3 +59,18 @@ delayOptions: [90, 180] initialBeepDelay: 30 # Gives the bomb some more stealth options due to how loud the timer is. beepSound: /Audio/Machines/timer.ogg + +- 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