From e3cef0f86c0ddb84236e528338c16d845ef32aff Mon Sep 17 00:00:00 2001 From: Sailor <109166122+Equivocateur@users.noreply.github.com> Date: Sun, 9 Jul 2023 22:20:04 +0300 Subject: [PATCH] Deflate the "valid" sticker economy and ward off permahungry sec (#17883) * Deflate the valid sticker economy * Include suggestions * Hint received * Replace combat gloves with susbox, add outlaw items to group * Go back on the rename skit because due to LRP being unsolvable * Ever forget to mirror a change to both loot pools? * clarity * Incorrect toolbox --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 80 +++++++++++++++++++ .../Entities/Clothing/Back/duffel.yml | 4 +- .../Entities/Clothing/Hands/gloves.yml | 2 - .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Clothing/OuterClothing/softsuits.yml | 4 +- .../Smokeables/Cigarettes/packs.yml | 4 +- 6 files changed, 87 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 6396a52834..59fedf3654 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -131,6 +131,43 @@ prob: 0.20 - id: DrinkSpaceLube prob: 0.20 + # Syndicate loot + - id: null + prob: 0.95 + orGroup: syndiemaintloot + - id: ClothingUniformJumpskirtOperative + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingUniformJumpsuitOperative + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBackpackDuffelSyndicate + prob: 0.005 + orGroup: syndiemaintloot + - id: CyberPen + prob: 0.005 + orGroup: syndiemaintloot + - id: CigPackSyndicate + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBackpackDuffelSyndicatePyjamaBundle + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBeltMilitaryWebbing + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingShoesBootsCombatFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: ToolboxSyndicateFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: BalloonSyn + prob: 0.005 + orGroup: syndiemaintloot + - id: WeaponSniperMosin + prob: 0.0010 + orGroup: syndiemaintloot - type: entity id: ClosetWallMaintenanceFilledRandom @@ -171,3 +208,46 @@ prob: 0.1 - id: ClothingHandsGlovesColorYellowBudget prob: 0.25 + # Syndicate loot + - id: null + prob: 0.95 + orGroup: syndiemaintloot + - id: ClothingUniformJumpskirtOperative + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingUniformJumpsuitOperative + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBackpackDuffelSyndicate + prob: 0.005 + orGroup: syndiemaintloot + - id: CyberPen + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingHeadHatOutlawHat + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingEyesGlassesOutlawGlasses + prob: 0.005 + orGroup: syndiemaintloot + - id: CigPackSyndicate + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBackpackDuffelSyndicatePyjamaBundle + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingBeltMilitaryWebbing + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingShoesBootsCombatFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: ToolboxSyndicateFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: BalloonSyn + prob: 0.005 + orGroup: syndiemaintloot + - id: WeaponSniperMosin + prob: 0.0010 + orGroup: syndiemaintloot diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index e88372c445..c29d991af8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -95,7 +95,7 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/chemistry.rsi - + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelVirology @@ -104,7 +104,7 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/virology.rsi - + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelGenetics diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index f1734f759b..768844d0b3 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -79,9 +79,7 @@ - type: entity parent: ClothingHandsGlovesBoxingBlue id: ClothingHandsGlovesBoxingRigged - name: blue boxing gloves suffix: Rigged - description: Regal blue gloves, with a nice gold trim. Swanky. components: - type: StaminaDamageOnHit damage: 30 diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 0b79409ecd..50f38a8f41 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -36,7 +36,7 @@ sprite: Clothing/Head/Helmets/eva_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/eva_syndicate.rsi - + #Cosmonaut Helmet - type: entity parent: ClothingHeadEVAHelmetBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 02c92903ca..109cd3d022 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -16,7 +16,7 @@ #Syndicate EVA - type: entity parent: ClothingOuterEVASuitBase - id: ClothingOuterHardsuitSyndicate + id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate name: syndicate EVA suit description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" components: @@ -107,4 +107,4 @@ Heat: 0.90 Radiation: 0.75 Caustic: 0.5 - - type: GroupExamine \ No newline at end of file + - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index d81adaf35a..bca512c2bd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -110,8 +110,8 @@ - type: entity id: CigPackSyndicate parent: CigPackBase - name: Syndicate Smokes packet - description: Elite cigarettes for elite agents. Infused with medicine for when you need to do more than calm your nerves. + name: Interdyne herbals packet + description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi