Added 18 new bounties to cargo (#26160)

* Added 18 new bounties + tags, couple of balance tweaks

* Oops, 2 corn tags.

* Fixed another duplicate from merge conflict

* Fixed all arbitrage issues

* Removed metamorphic glass/manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Changed hiviz tag, removed commented out bounty

* Removed extra line

* Change HiViz tag

* Removed unused tag

* Removed LaceupShoes, changed HiViz

* Changed flavor text for fruit bounty

* Removed live mouse bounty

Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs

@@ -12,7 +12,7 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// Maximum amount of bounties a station can have.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public int MaxBounties = 5;
+    public int MaxBounties = 6;
 
     /// <summary>
     /// A list of all the bounties currently active for a station.

Resources/Locale/en-US/cargo/bounties.ftl

@@ -47,8 +47,24 @@ bounty-item-organs = Organ
 bounty-item-labeler = Hand labeler
 bounty-item-warm-cloth = Warm clothes
 bounty-item-battery = Battery
-bounty-lasergun = Laser gun
-bounty-food = Meat food
+bounty-item-lasergun = Laser gun
+bounty-item-food = Meat food
+bounty-item-fruit = Fruit
+bounty-item-vegetable = Vegetable
+bounty-item-chili = Bowl of chili
+bounty-item-rollerskates = Roller skates
+bounty-item-bedsheet = Bedsheet
+bounty-item-bandana = Bandana
+bounty-item-steak = Steak
+bounty-item-banana = Banana
+bounty-item-beer = Beer
+bounty-item-hi-viz-vest = Hi-viz vest
+bounty-item-torch = Torch
+bounty-item-medkit-box = Medkit box
+bounty-item-cardboard-box = Cardboard box
+bounty-item-wine = Wine bottle
+bounty-item-cotton-boll = Cotton boll
+bounty-item-microwave-machine-board = Microwave machine board
 
 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 CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
@@ -100,3 +116,19 @@ bounty-description-warm-cloth = The Unath construction crew freezes and is unabl
 bounty-description-battery = As the Arachnid settlement prepares for a solar flare, they are requesting a large shipment of power batteries. We're sending out a request for delivery.
 bounty-description-lasergun = The Salvage Caravan requests a large shipment of laser weapons to mop up a hive of xenomorphs.
 bounty-description-food = After the rat king invasion, a neighboring unathi station was left completely without food. A large meat food shipment is needed.
+bounty-description-fruit = A heroic monkey helped the chaplain catch a troublemaker hiding in the chapel, and the crew wants to reward him for his good work.
+bounty-description-vegetable = The new chef is a vegetarian, and botany can't keep up with their demands. We need some additional veggies to help keep things stocked.
+bounty-description-chili = Today's the Centcomm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
+bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a couple so they cna learn how bad an idea this is.
+bounty-description-bedsheet = Someone in Atmos keeps turning down the heater, and we're all shivering in our beds. Please send us some extra sheets to stay warm.
+bounty-description-bandana =  Bzzzt... Transmission from prison planet OC-1001: We're... reorganizing our command structure. Send us some bandanas so we can tell gan- I mean, departments apart.
+bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy?
+bounty-description-banana = Hi station! Botany won't gimme any more. They said slipping the HoS out an open airlock wasn't funny! Can you believe it? Help me out! HONK.
+bounty-description-beer = Some nefarious agent has stolen every single drink in the bar. Yes, everything. Help tide us over until we can find them.
+bounty-description-hi-viz-vest  = The clown stole the AME controller and won't back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little mroe bearable.
+bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
+bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
+bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
+bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
+bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
+bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.

Resources/Prototypes/Catalog/Bounties/bounties.yml

@@ -347,11 +347,11 @@
 
 - type: cargoBounty
   id: BountyRadio
-  reward: 7500
+  reward: 6500
   description: bounty-description-radio
   entries:
   - name: bounty-item-radio
-    amount: 12
+    amount: 7
     whitelist:
       components:
       - Headset
@@ -536,7 +536,7 @@
   description: bounty-description-lasergun
   idPrefix: IV
   entries:
-  - name: bounty-lasergun
+  - name: bounty-item-lasergun
     amount: 6
     whitelist:
       components:
@@ -548,8 +548,185 @@
   description: bounty-description-food
   idPrefix: UNTH
   entries:
-  - name: bounty-food
+  - name: bounty-item-food
     amount: 30
     whitelist:
       tags:
       - Meat
+
+- type: cargoBounty
+  id: BountyFruit
+  reward: 5000
+  description: bounty-description-fruit
+  entries:
+  - name: bounty-item-fruit
+    amount: 12
+    whitelist:
+      tags:
+      - Fruit
+
+- type: cargoBounty
+  id: BountyVegetable
+  reward: 6000
+  description: bounty-description-vegetable
+  entries:
+  - name: bounty-item-vegetable
+    amount: 14
+    whitelist:
+      tags:
+      - Vegetable
+
+- type: cargoBounty
+  id: BountyChili
+  reward: 5555
+  description: bounty-description-chili
+  entries:
+  - name: bounty-item-chili
+    amount: 3
+    whitelist:
+      tags:
+      - ChiliBowl
+
+- type: cargoBounty
+  id: BountyRollerskates
+  reward: 6500
+  description: bounty-description-rollerskates
+  entries:
+  - name: bounty-item-rollerskates
+    amount: 2
+    whitelist:
+      components:
+      - Skates
+
+- type: cargoBounty
+  id: BountyBedsheet
+  reward: 4100
+  description: bounty-description-bedsheet
+  entries:
+  - name: bounty-item-bedsheet
+    amount: 5
+    whitelist:
+      tags:
+      - Bedsheet
+
+- type: cargoBounty
+  id: BountyBandana
+  reward: 4000
+  description: bounty-description-bandana
+  entries:
+  - name: bounty-item-bandana
+    amount: 7
+    whitelist:
+      tags:
+      - Bandana
+
+- type: cargoBounty
+  id: BountySteak
+  reward: 3200
+  description: bounty-description-steak
+  entries:
+  - name: bounty-item-steak
+    amount: 4
+    whitelist:
+      tags:
+      - Steak
+
+- type: cargoBounty
+  id: BountyBanana
+  reward: 6009
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-banana
+    amount: 9
+    whitelist:
+      tags:
+      - Banana
+
+- type: cargoBounty
+  id: BountyBeer
+  reward: 3100
+  description: bounty-description-beer
+  entries:
+  - name: bounty-item-beer
+    amount: 6
+    whitelist:
+      tags:
+      - Beer
+
+- type: cargoBounty
+  id: BountyHiVizVest
+  reward: 3030
+  description: bounty-description-hi-viz-vest
+  entries:
+  - name: bounty-item-hi-viz-vest
+    amount: 3
+    whitelist:
+      tags:
+      - HiViz
+
+- type: cargoBounty
+  id: BountyTorch
+  reward: 2220
+  description: bounty-description-torch
+  entries:
+  - name: bounty-item-torch
+    amount: 6
+    whitelist:
+      tags:
+      - Torch
+
+- type: cargoBounty
+  id: BountyMedkitBox
+  reward: 2300
+  description: bounty-description-medkit-box
+  entries:
+  - name: bounty-item-medkit-box
+    amount: 4
+    whitelist:
+      tags:
+      - Medkit
+
+- type: cargoBounty
+  id: BountyCardboardBox
+  reward: 1500
+  description: bounty-description-cardobard-box
+  entries:
+  - name: bounty-item-cardboard-box
+    amount: 12
+    whitelist:
+      tags:
+      - BoxCardboard
+
+- type: cargoBounty
+  id: BountyWine
+  reward: 3000
+  description: bounty-description-wine
+  entries:
+  - name: bounty-item-wine
+    amount: 2
+    whitelist:
+      tags:
+      - Wine
+
+- type: cargoBounty
+  id: BountyCottonBoll
+  reward: 8600
+  description: bounty-description-cotton-boll
+  entries:
+  - name: bounty-item-cotton-boll
+    amount: 9
+    whitelist:
+      tags:
+      - CottonBoll
+
+- type: cargoBounty
+  id: BountyMicrowaveMachineBoard
+  reward: 4000
+  description: bounty-description-microwave-machine-board
+  entries:
+  - name: bounty-item-microwave-machine-board
+    amount: 2
+    whitelist:
+      tags:
+      - MicrowaveMachineBoard
+

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

@@ -14,6 +14,9 @@
     - 0,0,2,2
   - type: Sprite
     state: box
+  - type: Tag
+    tags:
+    - BoxCardboard
 
 - type: entity
   name: mousetrap box

Resources/Prototypes/Entities/Clothing/Head/bandanas.yml

@@ -20,6 +20,9 @@
     - state: icon_mask
       map: [ "unfoldedLayer" ]
       visible: false
+  - type: Tag
+    tags:
+    - Bandana
 
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBlack]

Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml

@@ -24,6 +24,7 @@
       visible: false
   - type: Tag
     tags:
+    - Bandana
     - HidesNose
 
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

@@ -63,6 +63,9 @@
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+  - type: Tag
+    tags:
+    - HiViz
 
 #(Bartender) vest
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -369,6 +369,9 @@
   - type: Icon
     sprite: Objects/Consumable/Drinks/beerglass.rsi
     state: icon
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkGlass
@@ -943,6 +946,9 @@
   - type: Icon
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
     state: icon
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkGlass

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -355,6 +355,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwinebottle.rsi
   - type: Sealable
+  - type: Tag
+    tags:
+    - Wine
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -501,6 +504,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
   - type: Sealable
+  - type: Tag
+    tags:
+    - Wine
 
 # Small Bottles
 
@@ -523,6 +529,9 @@
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
     closeable: false
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -543,6 +552,9 @@
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
     closeable: false
+  - type: Tag
+    tags:
+    - Beer
 
 
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -182,6 +182,9 @@
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -480,6 +483,9 @@
     sprite: Objects/Consumable/Drinks/beer_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/beer_can.rsi
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -499,3 +505,6 @@
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/wine_can.rsi
+  - type: Tag
+    tags:
+    - Wine

Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

@@ -718,6 +718,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: plain-cooked
@@ -777,6 +778,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: product-cooked
@@ -945,6 +947,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: goliath-cooked
@@ -974,6 +977,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: rouny-cooked
@@ -999,6 +1003,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: lizard-cooked

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -124,6 +124,9 @@
     sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
   - type: Produce
     seedId: laughinPea
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: tower-cap log
@@ -258,6 +261,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Banana
 
 - type: entity
   name: mimana
@@ -413,6 +417,7 @@
   - type: Tag
     tags:
     - Carrot
+    - Vegetable
   - type: SolutionContainerManager
     solutions:
       food:
@@ -458,6 +463,9 @@
     sprite: Objects/Specific/Hydroponics/cabbage.rsi
   - type: Produce
     seedId: cabbage
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: garlic
@@ -483,6 +491,9 @@
     sprite: Objects/Specific/Hydroponics/garlic.rsi
   - type: Produce
     seedId: garlic
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: lemon
@@ -658,6 +669,8 @@
   - type: Tag
     tags:
     - Potato
+    - Vegetable
+
 
 - type: entity
   name: tomato
@@ -712,6 +725,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: blue tomato
@@ -756,6 +770,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: blood tomato
@@ -798,6 +813,7 @@
   - type: Tag
     tags:
     - Fruit # Fuck you they're a fruit
+    - Vegetable
 
 - type: entity
   name: eggplant
@@ -824,6 +840,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: apple
@@ -912,6 +929,7 @@
   - type: Tag
     tags:
     - Corn
+    - Vegetable
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/corn.rsi
   - type: Produce
@@ -974,6 +992,9 @@
   - type: SliceableFood
     count: 5
     slice: FoodOnionSlice
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: red onion
@@ -1002,6 +1023,9 @@
   - type: SliceableFood
     count: 5
     slice: FoodOnionRedSlice
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: chanterelle cluster
@@ -1019,6 +1043,9 @@
     sprite: Objects/Specific/Hydroponics/chanterelle.rsi
   - type: Produce
     seedId: chanterelle
+  - type: Tag
+    tags:
+    - Vegetable
 
 # Slices
 
@@ -1129,6 +1156,9 @@
       sprite: Objects/Specific/Hydroponics/chili.rsi
     - type: Produce
       seedId: chili
+    - type: Tag
+      tags:
+      - Vegetable
 
 - type: entity
   name: chilly pepper
@@ -1180,6 +1210,9 @@
     seedId: aloe
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: poppy
@@ -1459,6 +1492,9 @@
       reagents:
       - ReagentId: MilkSoy
         Quantity: 5
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: spaceman's trumpet
@@ -1512,6 +1548,9 @@
       reagents:
       - ReagentId: CarpoToxin
         Quantity: 2
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: watermelon
@@ -1604,9 +1643,6 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
-  - type: Tag
-    tags:
-    - Fruit
 
 - type: entity
   name: grapes
@@ -1635,6 +1671,9 @@
       reagents:
       - ReagentId: JuiceGrape
         Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: berries
@@ -1707,7 +1746,6 @@
     tags:
     - Recyclable
     - Trash
-    - Fruit
   - type: SolutionContainerManager
     solutions:
       food:
@@ -1746,6 +1784,9 @@
     sprite: Objects/Specific/Hydroponics/pea.rsi
   - type: Produce
     seedId: pea
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: pumpkin
@@ -1794,6 +1835,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: cotton boll
@@ -1822,3 +1864,4 @@
   - type: Tag
     tags:
     - ClothMade
+    - CottonBoll

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -806,6 +806,10 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl
+
 
 - type: entity
   name: cold chili
@@ -830,6 +834,9 @@
             Quantity: 8
           - ReagentId: Vitamin
             Quantity: 4
+  - type: Tag
+    tags:
+    - ChiliBowl
 
 - type: entity
   name: chili con carnival
@@ -860,6 +867,9 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl
 
 - type: entity
   name: monkey's delight

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -1067,6 +1067,9 @@
       materialRequirements:
         Glass: 2
         Cable: 2
+    - type: Tag
+      tags:
+      - MicrowaveMachineBoard
 
 - type: entity
   id: FatExtractorMachineCircuitboard
@@ -1354,4 +1357,3 @@
     materialRequirements:
       Steel: 5
       CableHV: 2
-      

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -1422,6 +1422,9 @@
         reagents:
         - ReagentId: Nothing
           Quantity: 100
+  - type: Tag
+    tags:
+    - Banana
 
 - type: entity
   parent: DrinkBase

Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml

@@ -20,6 +20,9 @@
     - neck
   - type: StaticPrice
     price: 100
+  - type: Tag
+    tags:
+    - Bedsheet
 
 - type: entity
   id: BedsheetBlack

Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml

@@ -117,3 +117,6 @@
     - id: TrashBananaPeelExplosive
     sound:
       path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Banana

Resources/Prototypes/tags.yml

@@ -33,18 +33,30 @@
 - type: Tag
   id: Balloon
 
+- type: Tag
+  id: Banana
+
 - type: Tag
   id: BananaPeel
 
+- type: Tag
+  id: Bandana
+
 - type: Tag
   id: BaseballBat
 
 - type: Tag
   id: BBQsauce
 
+- type: Tag
+  id: Bedsheet
+
 - type: Tag
   id: Bee
 
+- type: Tag
+  id: Beer
+
 - type: Tag
   id: BikeHorn
 
@@ -204,6 +216,9 @@
 - type: Tag
   id: Bottle
 
+- type: Tag
+  id: BoxCardboard
+
 - type: Tag
   id: BoxHug
 
@@ -349,6 +364,9 @@
 - type: Tag
   id: ChemDispensable # container that can go into the chem dispenser
 
+- type: Tag
+  id: ChiliBowl
+
 - type: Tag
   id: Cigarette
 
@@ -403,6 +421,9 @@
 - type: Tag #Ohioans die happy
   id: Corn
 
+- type: Tag
+  id: CottonBoll
+
 - type: Tag
   id: Cow
 
@@ -676,6 +697,9 @@
 - type: Tag
   id: HighSecDoor
 
+- type: Tag
+  id: HiViz
+
 - type: Tag
   id: Hoe
 
@@ -839,6 +863,9 @@
 - type: Tag
   id: MicroBomb
 
+- type: Tag
+  id: MicrowaveMachineBoard
+
 - type: Tag
   id: MimeBelt
 
@@ -1136,6 +1163,9 @@
 - type: Tag
   id: StationMapElectronics
 
+- type: Tag
+  id: Steak
+
 - type: Tag
   id: StringInstrument
 
@@ -1205,6 +1235,9 @@
 - type: Tag
   id: UraniumGlassShard
 
+- type: Tag
+  id: Vegetable
+
 - type: Tag
   id: VimPilot
 
@@ -1244,6 +1277,9 @@
 - type: Tag
   id: Window
 
+- type: Tag
+  id: Wine
+
 - type: Tag
   id: Wirecutter