Service market addition and 2 new service bounties

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.

Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml

@@ -242,8 +242,6 @@
   income: 0
   level: 2
 
-
-
 - type: infrastructureLevel
   id: ILevelHunter3
   demotionXP: 650
@@ -277,6 +275,68 @@
   income: 30000
   level: 4
 
+#Persistence 14
+
+- type: infrastructureLevel
+  id: ILevelService1
+  demotionXP: 0
+  requiredXP: 0
+  name: Simple Corner Store (1)
+  markets:
+    - servicemarket
+  groups:
+    ServiceBounty : 4
+    HunterBounty : 2
+
+  income: -5000
+
+- type: infrastructureLevel
+  id: ILevelService2
+  demotionXP: 150
+  requiredXP: 200
+  name: Burgeoning Bodega (2)
+  markets:
+    - servicemarket
+    - servicemarket2
+  groups:
+    ServiceBounty : 7
+    HunterBounty : 2
+  income: 0
+  level: 2
+
+- type: infrastructureLevel
+  id: ILevelService3
+  demotionXP: 650
+  requiredXP: 700
+  name: Robust General Store (3)
+  markets:
+    - servicemarket
+    - servicemarket2
+    - servicemarket3
+  groups:
+    ServiceBounty : 9
+    HunterBounty : 3
+  income: 10000
+  level: 3
+
+- type: infrastructureLevel
+  id: ILevelService4
+  demotionXP: 1400
+  requiredXP: 1500
+  name: Space Mall (4)
+  markets:
+    - servicemarket
+    - servicemarket2
+    - servicemarket3
+    - servicemarket4
+  groups:
+    ServiceBounty : 10
+    HunterBounty : 5
+  income: 30000
+  level: 4
+
+
+
 - type: infrastructureLevel
   id: ILevelEngineer1
   demotionXP: 0

Resources/Prototypes/Catalog/Bounties/servicebounties.yml

@@ -283,3 +283,31 @@
   group: ServiceBounty
   bountyType: PayPer
 
+#Persistence 14
+
+
+- type: cargoBounty
+  id: BountyWehPlushie
+  reward: 900
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-weh-plushie
+    amount: 15
+    whitelist:
+      tags:
+      - PlushieLizard
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyHandyFlag
+  reward: 500
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-handy-flag
+    amount: 25
+    whitelist:
+      tags:
+      - FlagHand
+  group: ServiceBounty
+  bountyType: PayPer

Resources/Prototypes/Catalog/Cargo/markets.yml

@@ -31,6 +31,18 @@
 - type: cargoMarket
   id: sciencemarket4
 
+- type: cargoMarket
+  id: servicemarket
+
+- type: cargoMarket
+  id: servicemarket2
+
+- type: cargoMarket
+  id: servicemarket3
+
+- type: cargoMarket
+  id: servicemarket4
+
 - type: cargoMarket
   id: huntermarket
 
@@ -89,4 +101,4 @@
   id: medicalmarket3
 
 - type: cargoMarket
-  id: medicalmarket4
+  id: medicalmarket4

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

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

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

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

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:
+    - FlagHand
 
 - type: entity
   parent: BaseItem
@@ -21,6 +24,9 @@
     state: icon
   - type: Item
     sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
+  - type: Tag
+    tags:
+    - FlagHand
 
 - 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:
+    - FlagHand
 
 - type: entity
   parent: BaseItem
@@ -45,6 +54,9 @@
     state: icon
   - type: Item
     sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi
+  - type: Tag
+    tags:
+    - FlagHand
 
 - type: entity
   parent: BaseItem
@@ -57,3 +69,6 @@
     state: icon
   - type: Item
     sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi
+  - type: Tag
+    tags:
+    - FlagHand