From b0ddb0e64df2e0a2993b1c9391ad55e7e6ce1393 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Mon, 19 Jan 2026 14:28:40 -0800 Subject: [PATCH] Syndicate Wearables Category Rebalances (#42482) * wearables * oopdate * sdasadsads * the great reparenting * fucked it up a little bit * try this * probably smarter to do this tbqh. * better-er * ok should work for real now * slightly less woke idea * just need to stack cleaner and faster * this should resolve the test fails I think --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Locale/en-US/store/uplink-catalog.ftl | 2 +- Resources/Locale/en-US/thief/backpack.ftl | 4 +-- .../Catalog/Fills/Backpacks/duffelbag.yml | 21 +++++++++++ .../Catalog/Fills/Items/briefcases.yml | 7 ++-- .../Prototypes/Catalog/thief_toolbox_sets.yml | 3 +- .../Prototypes/Catalog/uplink_catalog.yml | 36 ++++++------------- .../Entities/Clothing/Eyes/specific.yml | 3 +- .../Entities/Clothing/OuterClothing/armor.yml | 14 ++------ .../OuterClothing/base_clothingouter.yml | 9 ++++- .../Entities/Clothing/OuterClothing/coats.yml | 26 ++++++++------ .../Clothing/OuterClothing/specific.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 10 ++++++ .../Entities/Objects/Devices/pda.yml | 8 +++++ .../Entities/Structures/Furniture/dresser.yml | 4 +-- 14 files changed, 87 insertions(+), 62 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index e8fdbf4ff2..0c8bce1600 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -337,7 +337,7 @@ uplink-saw-advanced-desc = A bleeding-edge surgical implement designed to cut th # Armor uplink-chameleon-name = Chameleon Kit -uplink-chameleon-desc = A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! +uplink-chameleon-desc = A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anyone on the station, and more! Comes with a free Agent ID card! uplink-clothing-no-slips-shoes-name = No-slip Shoes uplink-clothing-no-slips-shoes-desc = Chameleon shoes that protect you from slips. diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl index c3e579110d..99494285c4 100644 --- a/Resources/Locale/en-US/thief/backpack.ftl +++ b/Resources/Locale/en-US/thief/backpack.ftl @@ -18,8 +18,8 @@ thief-backpack-button-deselect = Select [X] thief-backpack-category-chameleon-name = Chameleon Kit thief-backpack-category-chameleon-description = You are everyone and no one; you are a master of disguise. - Includes: A full set of chameleon clothing, - a chameleon projector, and an Agent ID. + Includes: A full set of chameleon clothing with Agent ID, + a chameleon projector, and a fake mindshield implant. Disguise as anyone and anything. thief-backpack-category-tools-name = Breacher Kit diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index a39576eafe..1dd4e27f75 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -274,6 +274,27 @@ - id: ClothingShoesChameleon - id: ChameleonControllerImplanter +- type: entity + parent: ClothingBackpackChameleon + id: ClothingBackpackChameleonFillAgent + suffix: Fill, Chameleon, Syndie + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ChameleonAgentPDA + - id: ClothingUniformJumpsuitChameleon + - id: ClothingOuterChameleon + - id: ClothingNeckChameleon + - id: ClothingMaskGasChameleon + - id: ClothingHeadHatChameleon + - id: ClothingHandsChameleon + - id: ClothingEyesChameleon + - id: ClothingHeadsetChameleon + - id: ClothingShoesChameleon + - id: ChameleonControllerImplanter + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateEVABundle diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 9da3f0b519..baa3c4802d 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -40,16 +40,15 @@ containers: storagebase: !type:AllSelector children: + - id: ClothingOuterCoatJensenSyndie + - id: ClothingUniformJumpsuitTacticool - id: ClothingEyesGlassesSunglasses - id: SpaceCash30000 - id: EncryptionKeySyndie - id: RubberStampTrader - id: PhoneInstrumentSyndicate - - id: ClothingUniformJumpsuitTacticool - - id: ClothingOuterCoatJensen - id: ClothingHandsGlovesCombat - id: ClothingMaskNeckGaiter - - id: SyndieHandyFlag - type: entity id: BriefcaseThiefBribingBundleFilled @@ -60,7 +59,7 @@ containers: storagebase: !type:AllSelector children: + - id: ClothingOuterCoatJensen - id: ClothingEyesGlassesSunglasses - id: SpaceCash20000 - - id: ClothingOuterCoatJensen - id: ClothingHandsGlovesColorBlack diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml index 81e3d10972..c0f791ef76 100644 --- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml +++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml @@ -6,10 +6,9 @@ sprite: Objects/Devices/chameleon_projector.rsi state: icon content: - - ClothingBackpackChameleonFill + - ClothingBackpackChameleonFillAgent - ChameleonProjector - FakeMindShieldImplanter - - AgentIDCard - type: thiefBackpackSet id: ToolsSet diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index dee58741b2..c179b3e1d2 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1595,19 +1595,6 @@ name: uplink-black-jetpack-name description: uplink-black-jetpack-desc productEntity: JetpackBlackFilled - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 1 - cost: - Telecrystal: 2 - categories: - - UplinkWearables - -- type: listing - id: UplinkHolster - name: uplink-holster-name - description: uplink-holster-desc - productEntity: ClothingBeltSyndieHolster cost: Telecrystal: 1 categories: @@ -1627,7 +1614,7 @@ id: UplinkChameleon name: uplink-chameleon-name description: uplink-chameleon-desc - productEntity: ClothingBackpackChameleonFill + productEntity: ClothingBackpackChameleonFillAgent icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon } discountCategory: usualDiscounts discountDownTo: @@ -1657,9 +1644,9 @@ productEntity: ClothingOuterVestWeb discountCategory: usualDiscounts discountDownTo: - Telecrystal: 1 - cost: Telecrystal: 3 + cost: + Telecrystal: 5 categories: - UplinkWearables @@ -1683,9 +1670,9 @@ productEntity: ClothingShoesBootsMagSyndie discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 cost: - Telecrystal: 4 + Telecrystal: 2 categories: - UplinkWearables @@ -1695,11 +1682,8 @@ description: uplink-eva-syndie-desc icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEVABundle - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 1 cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkWearables @@ -1713,7 +1697,7 @@ discountDownTo: Telecrystal: 2 cost: - Telecrystal: 4 + Telecrystal: 3 categories: - UplinkWearables @@ -1727,7 +1711,7 @@ discountDownTo: Telecrystal: 4 cost: - Telecrystal: 8 + Telecrystal: 7 categories: - UplinkWearables @@ -1800,9 +1784,9 @@ description: uplink-clothing-conducting-gloves-desc productEntity: ClothingHandsGlovesConducting cost: - Telecrystal: 2 + Telecrystal: 1 categories: - - UplinkWearables + - UplinkPointless - type: listing id: UplinkBackpackSyndicate diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index b62773fe50..0abe003d5a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -1,10 +1,11 @@ - type: entity parent: [ClothingEyesBase, BaseChameleon] - id: ClothingEyesChameleon # no flash immunity, sorry + id: ClothingEyesChameleon name: sun glasses description: Useful both for security and cargonia. suffix: Chameleon components: + - type: FlashImmunity - type: Tag tags: # intentionally no WhitelistChameleon tag - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 341404af2b..fbd515475b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -103,7 +103,7 @@ sprite: Clothing/OuterClothing/Vests/detvest.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ ClothingOuterBaseMedium, AllowSuitStorageClothing ] id: ClothingOuterArmorBaseCarapace abstract: true components: @@ -117,10 +117,6 @@ Caustic: 0.9 - type: ExplosionResistance damageCoefficient: 0.65 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: HeldSpeedModifier - type: GroupExamine - type: entity @@ -151,7 +147,7 @@ #Web vest - type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] + parent: [ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband] id: ClothingOuterVestWeb name: web vest description: A synthetic armor vest. This one has added webbing and ballistic plates. @@ -167,14 +163,12 @@ Slash: 0.6 Piercing: 0.3 Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - type: StaticPrice price: 1500 #Elite web vest - type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] + parent: [ClothingOuterArmorBase, AllowSuitStorageClothing, BaseSyndicateContraband] id: ClothingOuterVestWebElite name: elite web vest description: A synthetic armor vest. This one has added webbing and heat resistant fibers. @@ -220,8 +214,6 @@ Slash: 0.7 Piercing: 0.5 Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 # Armor covering multiple body parts including limbs diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 1de646a363..b6cf2e4e6a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -29,9 +29,14 @@ parent: ClothingOuterBase id: ClothingOuterStorageBase components: + - type: Item + size: Normal + shape: + - 0,0,1,2 - type: Storage grid: - 0,0,2,1 + maxItemSize: Small - type: ContainerContainer containers: storagebase: !type:Container @@ -202,4 +207,6 @@ id: ClothingOuterBaseMedium components: - type: Item - size: Huge + size: Large + shape: + - 0,0,2,3 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 265b9e2374..fd5981074b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -10,7 +10,7 @@ sprite: Clothing/OuterClothing/Coats/bomber.rsi - type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBase] + parent: [ ClothingOuterBaseMedium, ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSecurityContraband ] id: ClothingOuterCoatDetective name: detective trenchcoat description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business. @@ -25,8 +25,6 @@ children: - id: SmokingPipeFilledTobacco - id: FlippoEngravedLighter - - type: ExplosionResistance - damageCoefficient: 1 #its a coat. it doesnt do shit - type: entity parent: [ClothingOuterCoatDetectiveLoadout] @@ -64,7 +62,7 @@ - type: entity abstract: true - parent: AllowSuitStorageClothing + parent: [ ClothingOuterArmorBase, ClothingOuterStorageBase ] id: ClothingOuterArmorHoS components: - type: Armor @@ -75,12 +73,10 @@ Piercing: 0.6 Heat: 0.7 Caustic: 0.75 # not the full 90% from ss13 because of the head - - type: ExplosionResistance - damageCoefficient: 0.9 - type: entity abstract: true - parent: AllowSuitStorageClothing + parent: [ ClothingOuterArmorBase, ClothingOuterStorageBase ] id: ClothingOuterArmorWarden components: - type: Armor @@ -91,11 +87,9 @@ Piercing: 0.7 Heat: 0.7 Caustic: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - type: entity - parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase, BaseSecurityCommandContraband] + parent: [BaseSecurityCommandContraband, ClothingOuterArmorHoS] id: ClothingOuterCoatHoSTrench name: head of security's armored trenchcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. @@ -118,6 +112,16 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodChaplainHood +- type: entity + parent: ClothingOuterCoatJensen + id: ClothingOuterCoatJensenSyndie + suffix: Syndie + components: + - type: EntityTableContainerFill + containers: + storagebase: + id: SyndieHandyFlag + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatTrench @@ -320,7 +324,7 @@ sprite: Clothing/OuterClothing/Coats/pirate.rsi - type: entity - parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase, BaseSecurityContraband] + parent: [ClothingOuterArmorWarden, BaseSecurityContraband] id: ClothingOuterCoatWarden name: warden's armored jacket description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml index 8b2116f0ca..56508af486 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingOuterBase, BaseChameleon] + parent: [ClothingOuterBase, AllowSuitStorageClothingGasTanks, BaseChameleon] id: ClothingOuterChameleon name: vest description: A thick vest with a rubbery, water-resistant shell. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 86df3c6ec1..8c78b46277 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -373,6 +373,11 @@ sprite: Clothing/OuterClothing/WinterCoats/coathosarmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOS + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot { } + storagebase: !type:Container + ents: [ ] ########################################################## - type: entity @@ -732,6 +737,11 @@ sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWarden + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot { } + storagebase: !type:Container + ents: [ ] ################################################################ - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b1bbe6bb2d..60016de4c3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1563,6 +1563,14 @@ enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface +- type: entity + parent: ChameleonPDA + id: ChameleonAgentPDA + suffix: Chameleon, Agent ID + components: + - type: Pda + id: AgentIDCard + - type: entity parent: BaseWidePDA id: WizardPDA diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index b1293ea1ef..2bbe6b004e 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -31,8 +31,8 @@ acts: [ "Destruction" ] - type: Storage grid: - - 0,0,6,3 - maxItemSize: Normal + - 0,0,7,4 + maxItemSize: Large - type: ContainerContainer containers: storagebase: !type:Container -- 2.52.0