Merge branch 'master' into fixcarpdesc

Resources/Changelog/Suspicion.yml

@@ -65,3 +65,31 @@
   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
+- author: Coolsurf6
+  changes:
+  - message: Disruptive Grenade Kit for 1TC replacing individual purchases of grenades
+    type: Add
+  - message: Syndicate Bomb has a 90 second timer and 30 second quiet period
+    type: Tweak
+  - message: Overall decreased TC cost of Explosives for Traitors
+    type: Tweak
+  - message: Explosive and Shrapnel Grenades from spawning naturally
+    type: Remove
+  id: 8
+  time: '2024-10-21T16:59:10.0000000+00:00'
+  url: https://github.com/Simyon264/Suspicion-on-Space-Station/pull/12

Resources/Locale/en-US/_SSS/store_items.ftl

@@ -1,2 +1,9 @@
 uplink-carp-box-name = Dehydrated Carp Box
 uplink-carp-box-desc = Box filled with 4 dehydrated carps. Make sure your friends pet them as well!
+
+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!

Resources/Prototypes/_SSS/Catalog/sss_uplink.yml

@@ -92,23 +92,13 @@
   categories:
   - SSSTraitorExplosives
   cost:
-    Telecrystal: 3
-
-- type: listing
-  id: UplinkExplosiveGrenadeFlashSSS
-  name: uplink-flash-grenade-name
-  description: uplink-flash-grenade-desc
-  productEntity: GrenadeFlashBang
-  categories:
-  - SSSTraitorExplosives
-  cost:
-    Telecrystal: 1
+    Telecrystal: 2
 
 - type: listing
-  id: UplinkSmokeGrenadeSSS
-  name: uplink-smoke-grenade-name
-  description: uplink-smoke-grenade-desc
-  productEntity: SmokeGrenade
+  id: UplinkBoxDisruptiveThrowableSSS
+  name: uplink-disruptive-throwable-name
+  description: uplink-disruptive-throwable-desc
+  productEntity: BoxDisruptiveThrowable
   categories:
   - SSSTraitorExplosives
   cost:
@@ -122,7 +112,7 @@
   categories:
   - SSSTraitorExplosives
   cost:
-    Telecrystal: 5
+    Telecrystal: 3
 
 - type: listing
   id: UplinkSupermatterGrenadeSSS
@@ -132,7 +122,7 @@
   categories:
   - SSSTraitorExplosives
   cost:
-    Telecrystal: 5
+    Telecrystal: 3
 
 - type: listing
   id: UplinkWhiteholeGrenadeSSS
@@ -169,20 +159,20 @@
   id: UplinkSyndicateBombSSS
   restockTime: 120
   name: uplink-exploding-syndicate-bomb-name
-  description: uplink-exploding-syndicate-bomb-desc
-  productEntity: SyndicateBomb
+  description: uplink-exploding-syndicate-bomb-SSS-desc
+  productEntity: SyndicateBombSSS
   categories:
   - SSSTraitorExplosives
   cost:
-    Telecrystal: 10
+    Telecrystal: 5
 
 - type: listing
   id: UplinkClusterGrenadeSSS
   name: uplink-cluster-grenade-name
   description: uplink-cluster-grenade-desc
   productEntity: ClusterGrenade
   cost:
-    Telecrystal: 8
+    Telecrystal: 5
   categories:
   - SSSTraitorExplosives
 
@@ -328,7 +318,7 @@
   description: uplink-clothing-no-slips-shoes-desc
   productEntity: ClothingShoesChameleonNoSlips
   cost:
-    Telecrystal: 4
+    Telecrystal: 2
   categories:
   - SSSTraitorWearables
 
@@ -338,7 +328,7 @@
   description: uplink-clothing-shoes-boots-mag-syndie-desc
   productEntity: ClothingShoesBootsMagSyndie
   cost:
-    Telecrystal: 4
+    Telecrystal: 1
   categories:
   - SSSTraitorWearables
 
@@ -349,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 +391,26 @@
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
+
+- type: listing
+  id: UplinkBoxDisruptiveThrowableSSSDetective
+  name: uplink-disruptive-throwable-name
+  description: uplink-disruptive-throwable-desc
+  productEntity: BoxDisruptiveThrowable
+  categories:
+  - 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

Resources/Prototypes/_SSS/Objects/store_items.yml

@@ -30,3 +30,47 @@
         reagents:
         - ReagentId: Water
           Quantity: 30
+
+- type: entity
+  parent: BoxCardboard
+  id: BoxDisruptiveThrowable
+  name: disruptive grenade kit
+  description: A set of 1 flash, smoke and stinger grenades. Perfect for slowing down and getting away.
+  suffix: Traitor
+  components:
+  - type: StorageFill
+    contents:
+    - id: GrenadeFlashBang
+    - id: SmokeGrenade
+    - id: GrenadeStinger
+  - type: Sprite
+    layers:
+    - state: box_of_doom
+
+- type: entity
+  parent: SyndicateBomb
+  id: SyndicateBombSSS
+  suffix: Traitor
+  name: syndicate bomb
+  description: A bomb for Syndicate operatives and agents alike. The real deal, no more training, get to it!
+  components:
+  - type: OnUseTimerTrigger
+    delay: 90
+    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

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

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

Resources/Prototypes/_SSS/suspicion_spawners.yml

@@ -145,7 +145,7 @@
       weight: 90
       children:
       - !type:GroupSelector
-        weight: 85 # Common 
+        weight: 85 # Common
         children:
         - id: ClothingEyesGlassesSunglasses
         - id: ClothingMaskGas
@@ -165,20 +165,20 @@
         - id: Ointment5
         - id: PipeBomb
         - id: FireBomb
-        - id: ExGrenade
+        # - id: ExGrenade # Removing the explosive grenade from rotation, most other throwables seem alright.
         # Toolboxes
         - !type:GroupSelector
           children:
           - id: ToolboxEmergencyFilled
           - id: ToolboxElectricalFilled
           - id: ToolboxMechanicalFilled
-        - id: ToolboxEmergencyFilled # we're not just doubling down on crowbar spawns, we're TRIPLING DOWN on them
+          - id: ToolboxEmergencyFilled # we're not just doubling down on crowbar spawns, we're TRIPLING DOWN on them
       - !type:GroupSelector
         weight: 10 # Rare
         children:
         - id: ClothingEyesHudMedical
         - id: MedkitFilled
-        - id: GrenadeShrapnel
+        # - id: GrenadeShrapnel # Removing the Shrapnel grenade from rotation.
         - id: GrenadeStinger
         - id: CombatMedipen
         - id: ToolboxSyndicateFilled

Resources/Prototypes/_SSS/tags.yml

@@ -0,0 +1,2 @@
+- type: Tag
+  id: ClothingOuterVestWebMercSuspicionUpgradeKit