From f7b8ee8a479abcbd5db1af92e53116143c074cb3 Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Fri, 31 Jul 2026 13:54:14 -0400 Subject: [PATCH 1/6] Service trade station and multiple service crates --- .../Catalog/Bounties/infrastructurelevels.yml | 67 +- .../Catalog/Fills/Crates/engineering.yml | 15 + .../Prototypes/Catalog/Fills/Crates/food.yml | 127 ++ .../Markers/Spawners/Grids/stations.yml | 30 + .../Catalog/Cargo/servicemarket.yml | 1505 +++++++++++++++++ 5 files changed, 1742 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml diff --git a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml index 6fc902c220b..07d5f61625d 100644 --- a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml +++ b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml @@ -242,8 +242,6 @@ income: 0 level: 2 - - - type: infrastructureLevel id: ILevelHunter3 demotionXP: 650 @@ -277,6 +275,71 @@ income: 30000 level: 4 +#Persistence 14 + +- type: infrastructureLevel + id: ILevelService1 + demotionXP: 0 + requiredXP: 0 + name: Simple Corner Store (1) + markets: + - servicemarket + groups: + ServiceBounty : 4 + ExplorationBounty : 1 + ScienceBounty : 1 + income: -5000 + +- type: infrastructureLevel + id: ILevelService2 + demotionXP: 150 + requiredXP: 200 + name: Burgeoning Bodega (2) + markets: + - huntermarket + - huntermarket2 + groups: + ServiceBounty : 6 + ExplorationBounty : 2 + ScienceBounty : 1 + income: 0 + level: 2 + +- type: infrastructureLevel + id: ILevelService3 + demotionXP: 650 + requiredXP: 700 + name: Robust General Store (3) + markets: + - huntermarket + - huntermarket2 + - huntermarket3 + groups: + ServiceBounty : 8 + ExplorationBounty : 2 + ScienceBounty : 2 + income: 10000 + level: 3 + +- type: infrastructureLevel + id: ILevelService4 + demotionXP: 1400 + requiredXP: 1500 + name: Space Mall (4) + markets: + - huntermarket + - huntermarket2 + - huntermarket3 + - huntermarket4 + groups: + ServiceBounty : 9 + ExplorationBounty : 3 + ScienceBounty : 3 + income: 30000 + level: 4 + + + - type: infrastructureLevel id: ILevelEngineer1 demotionXP: 0 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index c90bd648bce..98c39f48725 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -194,6 +194,21 @@ - id: ClothingOuterHardsuitEVA amount: 2 +#Persistence 14 + +- type: entity + parent: CrateToyBox + id: CrateServiceEvaKit + name: service EVA kit + description: A set consisting of two VERY prestigious EVA suits. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ClothingOuterHardsuitClown + - id: ClothingOuterHardsuitMime + - type: entity parent: CrateEngineering id: CrateRCDAmmo diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 52263a20019..c608e7432f9 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -54,6 +54,133 @@ - id: FoodContainerEgg amount: 2 +#Persistence 14 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkFlour + name: bulk flour crate + description: Extra flour for those extra large batches. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ReagentContainerFlour + amount: 10 + +- type: entity + parent: CrateFreezer + id: CrateFoodBulkMilk + name: bulk milk crate + description: In case the cows go on a hunger strike. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: DrinkMilkCarton + amount: 8 + - id: DrinkSoyMilkCarton + amount: 4 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkRice + name: bulk rice crate + description: Extra rice for those who want to feed a monastery. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ReagentContainerRice + amount: 10 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkSugar + name: bulk sugar crate + description: Extra sugar for those who have a sweet tooth. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ReagentContainerSugar + amount: 8 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkSalt + name: bulk salt crate + description: More salt than a [insert topical community here] convention. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: FoodCondimentPacketSalt + amount: 15 + +- type: entity + parent: CrateFreezer + id: CrateFoodBulkEgg + name: bulk egg crate + description: Bulk eggs for baking or throwing at people you dont like. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: FoodContainerEgg + amount: 6 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkOliveOil + name: bulk olive oil crate + description: Bulk olive oil for the aspiring pasta chef. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ReagentContainerOliveoil + amount: 8 + +- type: entity + parent: CrateFreezer + id: CrateFoodBulkTins + name: baking tin crate + description: Perfect for those that want to start a bakery. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: FoodPlateMuffinTin + amount: 8 + - id: FoodPlateTin + amount: 8 + +- type: entity + parent: CratePlastic + id: CrateFoodBulkUtensils + name: kitchen utensils crate + description: Extra kitchen utensils, in case the clown was allowed in the cafeteria unsupervised. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: BoxUtensil + amount: 5 + - id: FoodKebabSkewer + amount: 8 + - id: KitchenKnife + - id: DrinkGlass + - type: entity parent: CratePlastic id: CrateFoodDinnerware diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml b/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml index e1c16381bda..7079e8d8720 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml @@ -131,6 +131,36 @@ groups: StationBounty : 2 +#Persistence 14 + +- type: entity + parent: MarkerBase + id: TradeStationServiceSpawnerMarker + name: Grid Spawner + suffix: Service Trade Station + components: + - type: Sprite + layers: + - state: pink + - sprite: Objects/Materials/Scrap/generic.rsi + state: metal-1 + - type: GridSpawner + gridPath: /Maps/Shuttles/trading_outpost_industrial.yml + stationGrid: True + addComponents: + - type: TradeStation + levels: + - ILevelService1 + - ILevelService2 + - ILevelService3 + - ILevelService4 + markets: + - engineermarket + - type: StationCargoBountyDatabase + groups: + ServiceBounty : 3 + StationBounty : 2 + - type: entity parent: MarkerBase id: TradeStationExplorationSpawnerMarker diff --git a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml new file mode 100644 index 00000000000..f28002b8336 --- /dev/null +++ b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml @@ -0,0 +1,1505 @@ + + + + +#materials + +- type: cargoProduct + id: CardboardMaterialSeTS + icon: + sprite: Objects/Materials/materials.rsi + state: cardboard_3 + product: CrateMaterialCardboard + cost: 330 + category: cargoproduct-category-name-materials + group: servicemarket + +- type: cargoProduct + id: PaperMaterialSeTS + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper_3 + product: CrateMaterialPaper + cost: 185 + category: cargoproduct-category-name-materials + group: servicemarket + +- type: cargoProduct + id: MaterialTextilesSeTS + icon: + sprite: Objects/Materials/materials.rsi + state: cloth_3 + product: CrateMaterialTextiles + cost: 1300 + category: cargoproduct-category-name-materials + group: servicemarket2 + +- type: cargoProduct + id: MaterialBasicSeTS + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: generic_materials + product: CrateMaterialBasicResource + cost: 2000 + category: cargoproduct-category-name-materials + group: servicemarket2 + +- type: cargoProduct + id: MaterialAluminiumSeTS + icon: + sprite: Objects/Materials/Sheets/metal.rsi + state: titanium_3 + product: CrateMaterialAluminium + cost: 1250 + category: cargoproduct-category-name-materials + group: servicemarket3 + +- type: cargoProduct + id: ServiceBooksSeTS + icon: + sprite: Objects/Misc/books.rsi + state: book_icon + product: CrateServiceBooks + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceGuidebooksSeTS + icon: + sprite: Objects/Misc/books.rsi + state: book_icon + product: CrateServiceGuidebooks + cost: 700 + category: cargoproduct-category-name-service + group: servicemarket + + + + + + +#premade food and drink + +- type: cargoProduct + id: FoodPizzaSeTS + icon: + sprite: Objects/Consumable/Food/Baked/pizza.rsi + state: margherita-slice + product: CrateFoodPizza + cost: 1000 + category: cargoproduct-category-name-food + group: servicemarket + +- type: cargoProduct + id: FoodMRESeTS + icon: + sprite: Objects/Consumable/Food/snacks.rsi + state: nutribrick + product: CrateFoodMRE + cost: 2000 + category: cargoproduct-category-name-food + group: servicemarket + +- type: cargoProduct + id: MaterialWaterTankSeTS + icon: + sprite: Structures/Storage/tanks.rsi + state: watertank + product: WaterTankFull + cost: 800 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: FoodIceCreamSeTS + icon: + sprite: Objects/Consumable/Food/frozen.rsi + state: sandwich + product: CrateFoodIceCream + cost: 2000 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: FoodSnowconeSeTS + icon: + sprite: Objects/Consumable/Food/frozen.rsi + state: cone + product: CrateFoodSnowcone + cost: 2000 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: ServiceSodaDispenser + icon: + sprite: Objects/Consumable/Drinks/generic_jug.rsi + state: icon + product: CrateServiceSodaDispenser + cost: 850 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceBoozeDispenserSeTS + icon: + sprite: Objects/Consumable/Drinks/generic_jug.rsi + state: icon + product: CrateServiceBoozeDispenser + cost: 750 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: FoodSoftdrinksSeTS + icon: + sprite: Objects/Consumable/Drinks/cola.rsi + state: icon + product: CrateFoodSoftdrinks + cost: 1500 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: FoodHappyHonkMealsSeTS + icon: + sprite: Objects/Consumable/Food/burger.rsi + state: bigbite + product: CrateFoodHappyHonkBigBite + cost: 2500 + category: cargoproduct-category-name-food + group: servicemarket + +- type: cargoProduct + id: ServiceSmokeablesSeTS + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + state: icon + product: CrateServiceSmokeables + cost: 2000 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceCustomSmokable + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + state: icon + product: CrateServiceCustomSmokable + cost: 1000 + category: cargoproduct-category-name-service + group: servicemarket + + + + + +#Bureaucracy + + +- type: cargoProduct + id: ServiceBureaucracySeTS + icon: + sprite: Objects/Misc/pens.rsi + state: pen + product: CrateServiceBureaucracy + cost: 1000 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceFaxMachineSeTS + icon: + sprite: Structures/Machines/fax_machine.rsi + state: inserting_mothroach + product: CrateServiceFaxMachine + cost: 1000 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: ServicePersonnelSeTS + icon: + sprite: Objects/Misc/id_cards.rsi + state: default + product: CrateServicePersonnel + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: BusinessStartingKitCrateSeTS + icon: + sprite: Objects/Misc/bureaucracy.rsi + state: acquisition_form_words + product: BusinessStartingKit + cost: 7000 + category: cargoproduct-category-name-service + group: servicemarket2 + + + + + + + +#toys + +- type: cargoProduct + id: FunPlushiesSeTS + icon: + sprite: Objects/Fun/Plushies/human.rsi + state: icon + product: CrateFunPlushie + cost: 500 + category: cargoproduct-category-name-fun + group: servicemarket2 + +- type: cargoProduct + id: FunLizardPlushiesSeTS + icon: + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon + product: CrateFunLizardPlushieBulk + cost: 250 + category: cargoproduct-category-name-fun + group: servicemarket2 + +- type: cargoProduct + id: FunSharkPlushiesSeTS + icon: + sprite: Objects/Fun/Plushies/shark.rsi + state: blue + product: CrateFunSharkPlushieBulk + cost: 250 + category: cargoproduct-category-name-fun + group: servicemarket2 + +- type: cargoProduct + id: FunArtSuppliesSeTS + icon: + sprite: Objects/Fun/crayons.rsi + state: box + product: CrateFunArtSupplies + cost: 250 + category: cargoproduct-category-name-fun + group: servicemarket + +- type: cargoProduct + id: FunDartsSetSeTS + icon: + sprite: Objects/Fun/Darts/dart_red.rsi + state: icon + product: CrateFunDartsSet + cost: 900 + category: cargoproduct-category-name-fun + group: servicemarket + +- type: cargoProduct + id: FunBoardGames + icon: + sprite: Objects/Fun/dice.rsi + state: d6_6 + product: CrateFunBoardGames + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket + +- type: cargoProduct + id: FunBikeHornImplantsSeTS + icon: + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + product: CrateFunBikeHornImplants + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: FunSadTromboneImplantsSeTS + icon: + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + product: CrateFunSadTromboneImplants + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: FunLightImplantsSeTS + icon: + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + product: CrateFunLightImplants + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: FunPartySeTS + icon: + sprite: Objects/Consumable/Food/Baked/cake.rsi + state: birthday + product: CrateFunParty + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: CrateFunWaterGunsSeTS + icon: + sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi + state: display + product: CrateFunWaterGuns + cost: 750 + category: cargoproduct-category-name-fun + group: servicemarket2 + +- type: cargoProduct + id: CrateFunFoamGunsSeTS + icon: + sprite: Objects/Fun/Foam/foam_rifle.rsi + state: icon + product: CrateFunFoamGuns + cost: 2000 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunToyBoxSeTS + icon: + sprite: Structures/Storage/Crates/toybox.rsi + state: crate_icon + product: CrateFunToyBox + cost: 800 + category: cargoproduct-category-name-fun + group: servicemarket + +- type: cargoProduct + id: FunBoxingSeTS + icon: + sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi + state: icon + product: CrateFunBoxing + cost: 500 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunPirateSeTS + icon: + sprite: Structures/Storage/Crates/piratechest.rsi + state: crate_icon + product: CrateFunPirate + cost: 400 + category: cargoproduct-category-name-fun + group: mservicearket3 + +- type: cargoProduct + id: ServiceTheatreSeTS + icon: + sprite: Clothing/Mask/mime.rsi + state: icon + product: CrateServiceTheatre + cost: 1000 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: FunMysteryFigurinesSeTS + icon: + sprite: Objects/Fun/figurines.rsi + state: fig_box + product: CrateFunMysteryFigurines + cost: 4000 + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: ServiceEvaKitSeTS + icon: + sprite: Clothing/Head/Hardsuits/clown.rsi + state: icon + product: CrateServiceEvaKit + cost: 6500 + category: cargoproduct-category-name-engineering + group: servicemarket + + + + + + + + +#plants + +- type: cargoProduct + id: HydroponicsSeedsExoticSeTS + icon: + sprite: Objects/Specific/Hydroponics/banana.rsi + state: seed + product: CrateHydroponicsSeedsExotic + cost: 3000 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: HydroponicsSeedsMedicinalSeTS + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: seed + product: CrateHydroponicsSeedsMedicinal + cost: 1500 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: HydroponicsToolsSeTS + icon: + sprite: Objects/Tools/Hydroponics/hoe.rsi + state: icon + product: CrateHydroponicsTools + cost: 800 + category: cargoproduct-category-name-hydroponics + group: servicemarket + +- type: cargoProduct + id: HydroponicsSeedsSeTS + icon: + sprite: Objects/Specific/Hydroponics/apple.rsi + state: seed + product: CrateHydroponicsSeeds + cost: 1300 + category: cargoproduct-category-name-hydroponics + group: servicemarket + +- type: cargoProduct + id: HydroponicsTraySeTS + icon: + sprite: Structures/Hydroponics/containers.rsi + state: hydrotray3 + product: CrateHydroponicsTray + cost: 1100 + category: cargoproduct-category-name-hydroponics + group: servicemarket + +- type: cargoProduct + id: FunPlantsSeTS + icon: + sprite: Structures/Furniture/potted_plants.rsi + state: random + product: CratePlants + cost: 500 + category: cargoproduct-category-name-fun + group: servicemarket + +- type: cargoProduct + id: BulkPlantBGoneSeTS + icon: + sprite: Objects/Specific/Chemistry/jug.rsi + state: icon_empty + product: CratePlantBGone + cost: 2000 + category: cargoproduct-category-name-hydroponics + group: servicemarket + + + + + + + + +#Cooking + +- type: cargoProduct + id: FoodCookIngredientsSeTS + icon: + sprite: Objects/Consumable/Food/ingredients.rsi + state: flour-big + product: CrateFoodCooking + cost: 900 + category: cargoproduct-category-name-food + group: servicemarket + +- type: cargoProduct + id: FoodCookFlourSeTS + icon: + sprite: Objects/Consumable/Food/ingredients.rsi + state: dough + product: CrateFoodBulkFlour + cost: 1000 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookMilkSeTS + icon: + sprite: Objects/Consumable/Drinks/milk.rsi + state: icon + product: CrateFoodBulkMilk + cost: 1000 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookRiceSeTS + icon: + sprite: Objects/Consumable/Food/ingredients.rsi + state: rice-big + product: CrateFoodBulkRice + cost: 800 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookSugarSeTS + icon: + sprite: Objects/Consumable/Food/ingredients.rsi + state: sugar-big + product: CrateFoodBulkSugar + cost: 800 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookSaltSeTS + icon: + sprite: Objects/Materials/ore.rsi + state: salt + product: CrateFoodBulkSalt + cost: 800 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookEggSeTS + icon: + sprite: Objects/Consumable/Food/meals.rsi + state: friedegg + product: CrateFoodBulkEgg + cost: 800 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookOilSeTS + icon: + sprite: Objects/Consumable/Food/ingredients.rsi + state: oliveoilsugar-big + product: CrateFoodBulkOliveOil + cost: 800 + category: cargoproduct-category-name-food + group: servicemarket3 + +- type: cargoProduct + id: FoodCookGetmoreSeTS + icon: + sprite: Objects/Consumable/Food/snacks.rsi + state: raisins + product: CrateFoodGetMore + cost: 750 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: FoodCookBulkTinsSeTS + icon: + sprite: Objects/Consumable/Food/plates.rsi + state: muffin-tin + product: CrateFoodBulkTins + cost: 1000 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: FoodDinnerwareSeTS + icon: + sprite: Objects/Consumable/Food/plates.rsi + state: tin + product: CrateFoodDinnerware + cost: 750 + category: cargoproduct-category-name-food + group: servicemarket + +- type: cargoProduct + id: FoodDinnerwareSeTS + icon: + sprite: Objects/Weapons/Melee/kitchen_knife.rsi + state: icon + product: CrateFoodDinnerware + cost: 750 + category: cargoproduct-category-name-food + group: servicemarket2 + +- type: cargoProduct + id: FoodBarSupplySeTS + icon: + sprite: Objects/Consumable/Drinks/beerglass.rsi + state: icon + product: CrateFoodBarSupply + cost: 750 + category: cargoproduct-category-name-food + group: servicemarket + + + + + + + + +# Instruments + +- type: cargoProduct + id: FunInstrumentsVarietySeTS + icon: + sprite: Objects/Fun/Instruments/accordion.rsi + state: icon + product: CrateFunInstrumentsVariety + cost: 1500 + category: cargoproduct-category-name-fun + group: servicemarket2 + +- type: cargoProduct + id: FunInstrumentsBrassSeTS + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: tuba + product: CrateFunInstrumentsBrass + cost: 1500 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunInstrumentsStringSeTS + icon: + sprite: Objects/Fun/Instruments/bassguitar.rsi + state: icon + product: CrateFunInstrumentsString + cost: 2000 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunInstrumentsWoodwindSeTS + icon: + sprite: Objects/Fun/Instruments/harmonica.rsi + state: icon + product: CrateFunInstrumentsWoodwind + cost: 2500 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunInstrumentsKeyedPercussionSeTS + icon: + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + state: icon + product: CrateFunInstrumentsKeyedPercussion + cost: 2000 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunInstrumentsSpecialSeTS + icon: + sprite: Objects/Fun/Instruments/gunpet.rsi + state: icon + product: CrateFunInstrumentsSpecial + cost: 6000 + category: cargoproduct-category-name-fun + group: servicemarket3 + +- type: cargoProduct + id: FunInstrumentsRandomSeTS + icon: + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + state: supersynth + product: CrateFunInstrumentsRandom + cost: 2000 + category: cargoproduct-category-name-fun + group: servicemarket2 + + + + + + + +#jani stuff + +- type: cargoProduct + id: ServiceJanitorialSeTS + icon: + sprite: Objects/Specific/Janitorial/spray_bottle.rsi + state: cleaner + product: CrateServiceJanitorialSupplies + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceCleanerGrenadesSeTS + icon: + sprite: Objects/Weapons/Grenades/janitor.rsi + state: icon + product: CrateServiceCleanerGrenades + cost: 200 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: ServiceLightsReplacementSeTS + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + product: CrateServiceReplacementLights + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceLightsColorfulSeTS + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + product: CrateServiceColorfulLights + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceLightsHolidaySeTS + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + product: CrateServiceHolidayLights + cost: 500 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: ServiceCandlesSeTS + icon: + sprite: Objects/Misc/candles.rsi + state: candle-big + product: CrateCandles + cost: 400 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: ServiceMouseTrapSeTS + icon: + sprite: Objects/Devices/mousetrap.rsi + state: mousetrap + product: CrateMousetrapBoxes + cost: 100 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: ServiceBoxesSeTS + icon: + sprite: Objects/Storage/boxes.rsi + state: box + product: CrateServiceBox + cost: 300 + category: cargoproduct-category-name-service + group: servicemarket + + + + + + + + +# Animals + +- type: cargoProduct + id: HydratedScurretSeTS + icon: + sprite: Structures/Wallmounts/posters.rsi + state: poster55_legit + product: CrateFunScurret + cost: 20000 # You will surely not regret buying this + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: HamletSeTS + icon: + sprite: Structures/Machines/fax_machine.rsi + state: inserting_hamster + product: CrateNPCHamlet + cost: 20000 # You will surely not regret buying this + category: cargoproduct-category-name-fun + group: servicemarket4 + +- type: cargoProduct + id: LivestockBeeSeTS + icon: + sprite: Mobs/Animals/bee.rsi + state: 0 + product: CrateNPCBee + cost: 6000 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockButterflySeTS + icon: + sprite: Mobs/Animals/butterfly.rsi + state: butterfly + product: CrateNPCButterflies + cost: 4000 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockCatSeTS + icon: + sprite: Mobs/Pets/cat.rsi + state: cat + product: CrateNPCCat + cost: 1200 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockChickenSeTS + icon: + sprite: Mobs/Animals/chicken.rsi + state: icon-1 + product: CrateNPCChicken + cost: 3000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockCrabSeTS + icon: + sprite: Mobs/Animals/crab.rsi + state: crab + product: CrateNPCCrab + cost: 2000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockDuckSeTS + icon: + sprite: Mobs/Animals/duck.rsi + state: icon-0 + product: CrateNPCDuck + cost: 3000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockCorgiSeTS + icon: + sprite: Mobs/Pets/corgi.rsi + state: corgi + product: CrateNPCCorgi + cost: 1200 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockPupCorgiSeTS + icon: + sprite: Mobs/Pets/corgi.rsi + state: puppy + product: CrateNPCPuppyCorgi + cost: 1200 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockCowSeTS + icon: + sprite: Mobs/Animals/cow.rsi + state: cow + product: CrateNPCCow + cost: 3000 + category: cargoproduct-category-name-livestock + group: servicemarket2 + +- type: cargoProduct + id: LivestockGoatSeTS + icon: + sprite: Mobs/Animals/goat.rsi + state: goat + product: CrateNPCGoat + cost: 1000 + category: cargoproduct-category-name-livestock + group: servicemarket2 + +- type: cargoProduct + id: LivestockGooseSeTS + icon: + sprite: Mobs/Animals/goose.rsi + state: goose + product: CrateNPCGoose + cost: 2100 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockGorillaSeTS + icon: + sprite: Mobs/Animals/gorilla.rsi + state: icon + product: CrateNPCGorilla + cost: 1100 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockMouse + icon: + sprite: Mobs/Animals/mouse.rsi + state: icon-0 + product: CrateNPCMouse + cost: 4000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockParrotSeTS + icon: + sprite: Mobs/Animals/parrot/parrot.rsi + state: parrot + product: CrateNPCParrot + cost: 3000 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockPenguinSeTS + icon: + sprite: Mobs/Animals/penguin.rsi + state: penguin + product: CrateNPCPenguin + cost: 2100 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockPig + icon: + sprite: Mobs/Animals/pig.rsi + state: pig + product: CrateNPCPig + cost: 1100 + category: cargoproduct-category-name-livestock + group: servicemarket2 + +- type: cargoProduct + id: LivestockSnakeSeTS + icon: + sprite: Mobs/Animals/snake.rsi + state: snake + product: CrateNPCSnake + cost: 3000 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockHamsterSeTS + icon: + sprite: Mobs/Animals/hamster.rsi + state: icon-0 + product: CrateNPCHamster + cost: 2800 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockLizardSeTS + icon: + sprite: Mobs/Animals/lizard.rsi + state: lizard + product: CrateNPCLizard + cost: 1000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + +- type: cargoProduct + id: LivestockKangarooSeTS + icon: + sprite: Mobs/Animals/kangaroo.rsi + state: kangaroo + product: CrateNPCKangaroo + cost: 2800 + category: cargoproduct-category-name-livestock + group: servicemarket4 + +- type: cargoProduct + id: LivestockMothroachSeTS + icon: + sprite: Mobs/Animals/mothroach/mothroach.rsi + state: mothroach + product: CrateNPCMothroach + cost: 1000 + category: cargoproduct-category-name-livestock + group: servicemarket3 + + + + + + + + +# Machines + +- type: cargoProduct + id: CrateVendingMachineRestockBoozeSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockBooze + container: + entity: WrappedParcel + containerId: contents + cost: 3500 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockChefvendSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockChefvend + container: + entity: WrappedParcel + containerId: contents + cost: 680 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockClothesSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockClothes + container: + entity: WrappedParcel + containerId: contents + cost: 2500 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: CrateVendingMachineRestockDinnerwareSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockDinnerware + container: + entity: WrappedParcel + containerId: contents + cost: 2000 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockCondimentStationSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockCondimentStation + container: + entity: WrappedParcel + containerId: contents + cost: 300 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockGamesSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockGames + container: + entity: WrappedParcel + containerId: contents + cost: 750 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockHotDrinksSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockHotDrinks + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockNutriMaxSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockNutriMaxFilled + cost: 2400 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockPTechSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockPTech + container: + entity: WrappedParcel + containerId: contents + cost: 1200 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockRobustSoftdrinksSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockRobustSoftdrinks + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockSeedsSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockSeedsFilled + cost: 3600 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockSmokesSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockSmokes + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockTankDispenserSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockTankDispenser + container: + entity: WrappedParcel + containerId: contents + cost: 1000 + category: cargoproduct-category-name-atmospherics + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockHappyHonkSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockHappyHonk + container: + entity: WrappedParcel + containerId: contents + cost: 1050 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: CrateVendingMachineRestockGetmoreChocolateCorpSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockGetmoreChocolateCorp + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockChangSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockChang + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockDiscountDansSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockDiscountDans + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: CrateVendingMachineRestockDonutSeTS + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockDonut + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineBoozeSeTS + icon: + sprite: Structures/Machines/VendingMachines/boozeomat.rsi + state: off + product: VendingMachineBooze + cost: 3800 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineChefvendSeTS + icon: + sprite: Structures/Machines/VendingMachines/chefvend.rsi + state: off + product: VendingMachineChefvend + cost: 980 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineClothingSeTS + icon: + sprite: Structures/Machines/VendingMachines/clothing.rsi + state: off + product: VendingMachineClothing + cost: 2800 + category: cargoproduct-category-name-service + group: servicemarket + +- type: cargoProduct + id: VendingMachineTheaterSeTS + icon: + sprite: Structures/Machines/VendingMachines/theater.rsi + state: off + product: VendingMachineTheater + cost: 2800 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineDinnerwareSeTS + icon: + sprite: Structures/Machines/VendingMachines/dinnerware.rsi + state: off + product: VendingMachineDinnerware + cost: 2300 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineCondimentsSeTS + icon: + sprite: Structures/Machines/VendingMachines/condiments.rsi + state: off + product: VendingMachineCondiments + cost: 600 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineGamesSeTS + icon: + sprite: Structures/Machines/VendingMachines/games.rsi + state: off + product: VendingMachineGames + cost: 1050 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineCoffeeSeTS + icon: + sprite: Structures/Machines/VendingMachines/coffee.rsi + state: off + product: VendingMachineCoffee + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineNutriSeTS + icon: + sprite: Structures/Machines/VendingMachines/nutri.rsi + state: off + product: VendingMachineNutri + cost: 2400 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineCartSeTS + icon: + sprite: Structures/Machines/VendingMachines/cart.rsi + state: off + product: VendingMachineCart + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineColaSeTS + icon: + sprite: Structures/Machines/VendingMachines/cola.rsi + state: off + product: VendingMachineCola + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineSeedsUnlockedSeTS + icon: + sprite: Structures/Machines/VendingMachines/seeds.rsi + state: off + product: VendingMachineSeedsUnlocked + cost: 3900 + category: cargoproduct-category-name-hydroponics + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineCigsSeTS + icon: + sprite: Structures/Machines/VendingMachines/cigs.rsi + state: off + product: VendingMachineCigs + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineTankDispenserEVASeTS + icon: + sprite: Structures/Machines/VendingMachines/tankdispenser.rsi + state: dispenser + product: VendingMachineTankDispenserEVA + cost: 1300 + category: cargoproduct-category-name-atmospherics + group: servicemarket2 + +- type: cargoProduct + id: VendingMachineHappyHonkSeTS + icon: + sprite: Structures/Machines/VendingMachines/happyhonk.rsi + state: off + product: VendingMachineHappyHonk + cost: 2400 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineSnackSeTS + icon: + sprite: Structures/Machines/VendingMachines/snack.rsi + state: off + product: VendingMachineSnack + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineChangSeTS + icon: + sprite: Structures/Machines/VendingMachines/changs.rsi + state: off + product: VendingMachineChang + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineDiscountSeTS + icon: + sprite: Structures/Machines/VendingMachines/discount.rsi + state: off + product: VendingMachineDiscount + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineDonutSeTS + icon: + sprite: Structures/Machines/VendingMachines/donut.rsi + state: off + product: VendingMachineDonut + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineSovietSodaSeTS + icon: + sprite: Structures/Machines/VendingMachines/sovietsoda.rsi + state: off + product: VendingMachineSovietSoda + cost: 1500 + category: cargoproduct-category-name-service + group: servicemarket3 + +- type: cargoProduct + id: VendingMachineSustenanceSeTS + icon: + sprite: Structures/Machines/VendingMachines/sustenance.rsi + state: off + product: VendingMachineSustenance + cost: 980 + category: cargoproduct-category-name-service + group: servicemarket3 + + + + + + + From eb10bd3a4bf1ec1e0b45c762b31a04d3825a486d Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Wed, 5 Aug 2026 14:11:14 -0400 Subject: [PATCH 2/6] Lizard plush and handy flag bounties + SeTS market --- Resources/Locale/en-US/cargo/bounties.ftl | 5 +++ .../Catalog/Bounties/infrastructurelevels.yml | 37 +++++++++---------- .../Catalog/Bounties/servicebounties.yml | 15 ++++++++ .../Entities/Objects/Misc/handy_flags.yml | 15 ++++++++ 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 65ac5f82fef..36f6f9a93c2 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -230,3 +230,8 @@ bounty-description-bear = I want one'o them fancy schmancy Ol' Sollian Bearhide bounty-description-spider = I wonder if Spider tastes like Crab? Get me some spider meat! and, yknow what! Their egg too! I'll pay big bucks! bounty-description-snake = Snakeskin seems so luxurious... I have a dire need for some snakeskin boots. Freshly killed for, ideally... send me its fresh meat as proof. bounty-description-xeno = Some people say their flesh tastes good. I don't believe that. Gimme some to sample... it can't be that good, can it? + + +#Persistence 14 + +bounty-description-weh-plushie = Morale has been low as of late and a little love is needed to cheer people up, those lizard plushies would work great to show our station that we care about them without actually having to care ourselves. diff --git a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml index 07d5f61625d..56496ba76db 100644 --- a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml +++ b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml @@ -286,8 +286,8 @@ - servicemarket groups: ServiceBounty : 4 - ExplorationBounty : 1 - ScienceBounty : 1 + HunterBounty : 2 + income: -5000 - type: infrastructureLevel @@ -296,12 +296,11 @@ requiredXP: 200 name: Burgeoning Bodega (2) markets: - - huntermarket - - huntermarket2 + - servicemarket + - servicemarket2 groups: - ServiceBounty : 6 - ExplorationBounty : 2 - ScienceBounty : 1 + ServiceBounty : 7 + HunterBounty : 2 income: 0 level: 2 @@ -311,13 +310,12 @@ requiredXP: 700 name: Robust General Store (3) markets: - - huntermarket - - huntermarket2 - - huntermarket3 + - servicemarket + - servicemarket2 + - servicemarket3 groups: - ServiceBounty : 8 - ExplorationBounty : 2 - ScienceBounty : 2 + ServiceBounty : 9 + HunterBounty : 3 income: 10000 level: 3 @@ -327,14 +325,13 @@ requiredXP: 1500 name: Space Mall (4) markets: - - huntermarket - - huntermarket2 - - huntermarket3 - - huntermarket4 + - servicemarket + - servicemarket2 + - servicemarket3 + - servicemarket4 groups: - ServiceBounty : 9 - ExplorationBounty : 3 - ScienceBounty : 3 + ServiceBounty : 10 + HunterBounty : 5 income: 30000 level: 4 diff --git a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml index 26ef55c5c5c..10d1a86184e 100644 --- a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml @@ -283,3 +283,18 @@ group: ServiceBounty bountyType: PayPer +#Persistence 14 + + +- type: cargoBounty + id: BountyWehPlushie + reward: 600 + description: bounty-description-weh-plushie + entries: + - name: bounty-item-weh-plushie + amount: 25 + whitelist: + tags: + - LizardPlushie + group: ServiceBounty + bountyType: PayPer diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 6df1a39dc8c..a06defc30e7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -9,6 +9,9 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi + - type: Tag + tags: + - HandyFlag - type: entity parent: BaseItem @@ -21,6 +24,9 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi + - type: Tag + tags: + - HandyFlag - type: entity parent: [BaseItem, BaseSyndicateContraband] @@ -33,6 +39,9 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi + - type: Tag + tags: + - HandyFlag - type: entity parent: BaseItem @@ -45,6 +54,9 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi + - type: Tag + tags: + - HandyFlag - type: entity parent: BaseItem @@ -57,3 +69,6 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi + - type: Tag + tags: + - HandyFlag From 663bbb497883a69964d0ed31bc7ef9723c5fadf7 Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Wed, 5 Aug 2026 16:10:52 -0400 Subject: [PATCH 3/6] Handyflag and wehplushie bounties plus SeTS fixes --- Resources/Locale/en-US/cargo/bounties.ftl | 5 +++ .../Catalog/Bounties/servicebounties.yml | 15 +++++++- .../Prototypes/Catalog/Fills/Crates/npc.yml | 1 + .../Entities/Objects/Misc/handy_flags.yml | 10 ++--- .../Catalog/Cargo/servicemarket.yml | 38 +++++-------------- Resources/Prototypes/tags.yml | 7 +++- 6 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 36f6f9a93c2..846f6a15bdc 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -137,6 +137,11 @@ bounty-item-opporozidone = Opporozidone bounty-item-liquid-desoxyephedrine = Liquid Desoxyephedrine bounty-item-liquid-space-mirage = Liquid Space Mirage +#Persistence 14 + +bounty-item-weh-plushie = Lizard plushies +bounty-item-handy-flag = Handy flag + bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery. diff --git a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml index 10d1a86184e..96b1fdea97b 100644 --- a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml @@ -295,6 +295,19 @@ amount: 25 whitelist: tags: - - LizardPlushie + - PlushieLizard + group: ServiceBounty + bountyType: PayPer + +- type: cargoBounty + id: BountyHandyFlag + reward: 500 + description: bounty-description-handy-flag + entries: + - name: bounty-item-handy-flag + amount: 25 + whitelist: + tags: + - FlagHand group: ServiceBounty bountyType: PayPer diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 84a58e67ce1..74565948aec 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -241,6 +241,7 @@ - type: entity parent: CrateRodentCage id: CrateNPCHamlet + name: Hamlet crate suffix: Hamlet components: - type: EntityTableContainerFill diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index a06defc30e7..bd66da8352e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -11,7 +11,7 @@ sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi - type: Tag tags: - - HandyFlag + - FlagHand - type: entity parent: BaseItem @@ -26,7 +26,7 @@ sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi - type: Tag tags: - - HandyFlag + - FlagHand - type: entity parent: [BaseItem, BaseSyndicateContraband] @@ -41,7 +41,7 @@ sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi - type: Tag tags: - - HandyFlag + - FlagHand - type: entity parent: BaseItem @@ -56,7 +56,7 @@ sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - type: Tag tags: - - HandyFlag + - FlagHand - type: entity parent: BaseItem @@ -71,4 +71,4 @@ sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi - type: Tag tags: - - HandyFlag + - FlagHand diff --git a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml index f28002b8336..6f029da3035 100644 --- a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml +++ b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml @@ -2,7 +2,7 @@ -#materials +#region materials - type: cargoProduct id: CardboardMaterialSeTS @@ -79,7 +79,7 @@ -#premade food and drink +#region premade food and drink - type: cargoProduct id: FoodPizzaSeTS @@ -192,11 +192,7 @@ group: servicemarket - - - -#Bureaucracy - +#region Bureaucracy - type: cargoProduct id: ServiceBureaucracySeTS @@ -239,12 +235,7 @@ group: servicemarket2 - - - - - -#toys +#region Toys - type: cargoProduct id: FunPlushiesSeTS @@ -433,7 +424,7 @@ -#plants +#region Plants - type: cargoProduct id: HydroponicsSeedsExoticSeTS @@ -506,13 +497,7 @@ group: servicemarket - - - - - - -#Cooking +#region Cooking - type: cargoProduct id: FoodCookIngredientsSeTS @@ -588,7 +573,7 @@ id: FoodCookOilSeTS icon: sprite: Objects/Consumable/Food/ingredients.rsi - state: oliveoilsugar-big + state: oliveoil product: CrateFoodBulkOliveOil cost: 800 category: cargoproduct-category-name-food @@ -651,7 +636,7 @@ -# Instruments +#region Instruments - type: cargoProduct id: FunInstrumentsVarietySeTS @@ -726,10 +711,7 @@ - - - -#jani stuff +#region Jani stuff - type: cargoProduct id: ServiceJanitorialSeTS @@ -818,7 +800,7 @@ -# Animals +#region Animals - type: cargoProduct id: HydratedScurretSeTS diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 562b9147d3a..e756089e60f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -35,7 +35,7 @@ - type: Tag id: ApcElectronics # ConstructionGraph - + - type: Tag id: Apron # ConstructionGraph: scraparmor @@ -595,6 +595,11 @@ - type: Tag id: FirelockElectronics # ConstructionGraph: Firelock +#Persistence 14 + +- type: Tag + id: FlagHand # Handy flags for bounties + - type: Tag id: Flare # Storage whitelist: BaseClothingBeltEngineering From e92855f753914fdf55bfe24381da70c77526ee11 Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Wed, 5 Aug 2026 16:31:44 -0400 Subject: [PATCH 4/6] Linter happy :D --- Resources/Locale/en-US/cargo/bounties.ftl | 5 ---- .../Catalog/Bounties/servicebounties.yml | 6 ++--- .../Prototypes/Catalog/Cargo/markets.yml | 14 ++++++++++- .../Catalog/Cargo/servicemarket.yml | 24 ++++++------------- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 846f6a15bdc..34b0f4aa48f 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -235,8 +235,3 @@ bounty-description-bear = I want one'o them fancy schmancy Ol' Sollian Bearhide bounty-description-spider = I wonder if Spider tastes like Crab? Get me some spider meat! and, yknow what! Their egg too! I'll pay big bucks! bounty-description-snake = Snakeskin seems so luxurious... I have a dire need for some snakeskin boots. Freshly killed for, ideally... send me its fresh meat as proof. bounty-description-xeno = Some people say their flesh tastes good. I don't believe that. Gimme some to sample... it can't be that good, can it? - - -#Persistence 14 - -bounty-description-weh-plushie = Morale has been low as of late and a little love is needed to cheer people up, those lizard plushies would work great to show our station that we care about them without actually having to care ourselves. diff --git a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml index 96b1fdea97b..d4f9f5bf20b 100644 --- a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml @@ -288,11 +288,10 @@ - type: cargoBounty id: BountyWehPlushie - reward: 600 - description: bounty-description-weh-plushie + reward: 900 entries: - name: bounty-item-weh-plushie - amount: 25 + amount: 15 whitelist: tags: - PlushieLizard @@ -302,7 +301,6 @@ - type: cargoBounty id: BountyHandyFlag reward: 500 - description: bounty-description-handy-flag entries: - name: bounty-item-handy-flag amount: 25 diff --git a/Resources/Prototypes/Catalog/Cargo/markets.yml b/Resources/Prototypes/Catalog/Cargo/markets.yml index 09d67c3932d..04476d56f86 100644 --- a/Resources/Prototypes/Catalog/Cargo/markets.yml +++ b/Resources/Prototypes/Catalog/Cargo/markets.yml @@ -31,6 +31,18 @@ - type: cargoMarket id: sciencemarket4 +- type: cargoMarket + id: servicemarket + +- type: cargoMarket + id: scervicemarket2 + +- type: cargoMarket + id: servicemarket3 + +- type: cargoMarket + id: servicemarket4 + - type: cargoMarket id: huntermarket @@ -89,4 +101,4 @@ id: medicalmarket3 - type: cargoMarket - id: medicalmarket4 \ No newline at end of file + id: medicalmarket4 diff --git a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml index 6f029da3035..faacb30a526 100644 --- a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml +++ b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml @@ -132,7 +132,7 @@ group: servicemarket2 - type: cargoProduct - id: ServiceSodaDispenser + id: ServiceSodaDispenserSeTS icon: sprite: Objects/Consumable/Drinks/generic_jug.rsi state: icon @@ -182,7 +182,7 @@ group: servicemarket - type: cargoProduct - id: ServiceCustomSmokable + id: ServiceCustomSmokableSeTS icon: sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi state: icon @@ -288,7 +288,7 @@ group: servicemarket - type: cargoProduct - id: FunBoardGames + id: FunBoardGamesSeTS icon: sprite: Objects/Fun/dice.rsi state: d6_6 @@ -385,7 +385,7 @@ product: CrateFunPirate cost: 400 category: cargoproduct-category-name-fun - group: mservicearket3 + group: servicearket3 - type: cargoProduct id: ServiceTheatreSeTS @@ -414,7 +414,7 @@ state: icon product: CrateServiceEvaKit cost: 6500 - category: cargoproduct-category-name-engineering + category: cargoproduct-category-name-atmospherics group: servicemarket @@ -599,16 +599,6 @@ category: cargoproduct-category-name-food group: servicemarket2 -- type: cargoProduct - id: FoodDinnerwareSeTS - icon: - sprite: Objects/Consumable/Food/plates.rsi - state: tin - product: CrateFoodDinnerware - cost: 750 - category: cargoproduct-category-name-food - group: servicemarket - - type: cargoProduct id: FoodDinnerwareSeTS icon: @@ -943,7 +933,7 @@ group: servicemarket4 - type: cargoProduct - id: LivestockMouse + id: LivestockMouseSeTS icon: sprite: Mobs/Animals/mouse.rsi state: icon-0 @@ -973,7 +963,7 @@ group: servicemarket3 - type: cargoProduct - id: LivestockPig + id: LivestockPigSeTS icon: sprite: Mobs/Animals/pig.rsi state: pig From bf7a62117c3b08ede875c8c53eb6d4f91c2447b2 Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Wed, 5 Aug 2026 16:42:14 -0400 Subject: [PATCH 5/6] typos fixed --- Resources/Prototypes/Catalog/Cargo/markets.yml | 2 +- .../Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/markets.yml b/Resources/Prototypes/Catalog/Cargo/markets.yml index 04476d56f86..25c778a39db 100644 --- a/Resources/Prototypes/Catalog/Cargo/markets.yml +++ b/Resources/Prototypes/Catalog/Cargo/markets.yml @@ -35,7 +35,7 @@ id: servicemarket - type: cargoMarket - id: scervicemarket2 + id: servicemarket2 - type: cargoMarket id: servicemarket3 diff --git a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml index faacb30a526..d017de54e8c 100644 --- a/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml +++ b/Resources/Prototypes/_Persistence14/Catalog/Cargo/servicemarket.yml @@ -385,7 +385,7 @@ product: CrateFunPirate cost: 400 category: cargoproduct-category-name-fun - group: servicearket3 + group: servicemarket3 - type: cargoProduct id: ServiceTheatreSeTS From 742fd6dfe2a51a10ea35e84136223000c72b508d Mon Sep 17 00:00:00 2001 From: Cluckers1 Date: Thu, 6 Aug 2026 18:46:28 -0400 Subject: [PATCH 6/6] Linter mad at bananas --- Resources/Prototypes/Catalog/Bounties/servicebounties.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml index d4f9f5bf20b..b9ce79950eb 100644 --- a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml @@ -289,6 +289,7 @@ - type: cargoBounty id: BountyWehPlushie reward: 900 + description: bounty-description-banana entries: - name: bounty-item-weh-plushie amount: 15 @@ -301,6 +302,7 @@ - type: cargoBounty id: BountyHandyFlag reward: 500 + description: bounty-description-banana entries: - name: bounty-item-handy-flag amount: 25