Mirror: Added 18 New Bounties to Cargo (DeltaV-Station#239)

## Mirror of PR #26160: [Added 18 new bounties to cargo](space-wizards/space-station-14#26160) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `4357b9ef08fee0e08c4fdf4eeef714fa8eb38112` PR opened by <img src="https://avatars.githubusercontent.com/u/1471082?v=4" width="16"/><a href="https://github.com/wafehling"> wafehling</a> at 2024-03-15 20:21:21 UTC --- PR changed 19 files with 373 additions and 22 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > I added 18 new bounties to cargo's bounty system, and tweaked a couple values in the existing system. (6 bounties at once instead of 5, reduced # of headsets needed for bounty to a sane number, fixed a couple inconsistencies) > > ## Why / Balance > > Spice things up, add variety, add a bit of balance. For fun! > > ## Technical details > Pretty much just Yaml/Ftl changes, added new bounty info + tags, Tweaked the active bounty count. > > ## Media > ![NewBounties](https://github.com/space-wizards/space-station-14/assets/1471082/74d61bc7-f438-4e3a-9a8c-bc59c3b1a55d) > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > None! Nothing got removed, and it's all just surface level yaml work. > > **Changelog** > 🆑 > - add: Added 18 new bounties to cargo bounty system. > > </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
LaryNevesPR · Jul 10, 2024 · d61e23d · d61e23d
1 parent 1258961
commit d61e23d
Show file tree

Hide file tree

Showing 20 changed files with 379 additions and 31 deletions.
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/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.

diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/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.
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/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
+
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/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

diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/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]
@@ -69,4 +72,4 @@
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBrown]
   id: ClothingHeadBandBrown
-  name: brown bandana
+  name: brown bandana
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -24,6 +24,7 @@
       visible: false
   - type: Tag
     tags:
+    - Bandana
     - HidesNose
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/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

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -202,7 +202,7 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSpurs
-      
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyBlack
@@ -212,7 +212,7 @@
     sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
-    
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyWhite
@@ -222,7 +222,7 @@
     sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
-    
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyFancy
@@ -231,4 +231,4 @@
   - type: Sprite
     sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
   - type: Clothing
-    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
+    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/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