Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Resources/Locale/en-US/cargo/bounties.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ bounty-item-bread = Bread
bounty-item-carp = Space carp
bounty-item-carrot = Carrot
bounty-item-carrot-fries = Carrot fries
bounty-item-clown-mask = Clown mask
bounty-item-clown-shoes = Clown shoes
bounty-item-corn = Ear of corn
bounty-item-crayon = Crayon
bounty-item-cuban-carp = Cuban carp
Expand Down Expand Up @@ -59,7 +57,6 @@ 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
Expand Down Expand Up @@ -87,7 +84,6 @@ bounty-description-bread = Problems with central planning have led to bread pric
bounty-description-carrot = After failing to watch instructional videos for proper welder safety, the salvage division on Station 15 has been blinded. Ship them some carrots so they can restore their eyesight.
bounty-description-carrot-fries = Night sight can mean life or death! A shipment of carrot fries is the order.
bounty-description-carp = Admiral Pavlov has gone on strike ever since Central Command confiscated her "pet." She is demanding a space carp as a replacement, dead or alive.
bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more.
bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it.
bounty-description-crayon = Dr Jones's kid ate all our crayons again. Please send us yours.
bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm.
Expand All @@ -105,7 +101,7 @@ bounty-description-lime = After a heavy drinking session, Admiral Pastich develo
bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, their lungs aren't fighting so hard anymore. Send them some new ones.
bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes.
bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike.
bounty-description-pancake = Here at NanoTrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen.
bounty-description-pancake = Here at NanoTrasen we consider employees to be family. And you know what families love? Pancakes. Ship half a dozen.
bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens.
bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more.
bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one.
Expand All @@ -132,7 +128,6 @@ bounty-description-food = After the rat king invasion, a neighboring Unathi stat
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 pair so they can 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?
Expand Down
30 changes: 2 additions & 28 deletions Resources/Prototypes/Catalog/Bounties/bounties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,6 @@
tags:
- Carp

- type: cargoBounty
id: BountyClownCostume
reward: 1700
description: bounty-description-clown-costume
entries:
- name: bounty-item-clown-mask
amount: 1
whitelist:
tags:
- ClownMask
- name: bounty-item-clown-shoes
amount: 1
whitelist:
tags:
- ClownShoes

- type: cargoBounty
id: BountyCorn
reward: 10000
Expand Down Expand Up @@ -273,11 +257,11 @@

- type: cargoBounty
id: BountyPancake
reward: 10000
reward: 5000
description: bounty-description-pancake
entries:
- name: bounty-item-pancake
amount: 13
amount: 6
whitelist:
tags:
- Pancake
Expand Down Expand Up @@ -597,16 +581,6 @@
tags:
- ChiliBowl

- type: cargoBounty
id: BountyRollerskates
reward: 900
description: bounty-description-rollerskates
entries:
- name: bounty-item-rollerskates
whitelist:
components:
- Skates

- type: cargoBounty
id: BountyBedsheet
reward: 4100
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,13 @@
id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth

- type: Tag
id: ClownMask # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownMask
id: ClownMask # ConstructionGraph: Honker, BananaClownMask

- type: Tag
id: ClownRecorder # ConstructionGraph: ClownHardsuit

- type: Tag
id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes
id: ClownShoes # ConstructionGraph: Honker, BananaClownShoes

- type: Tag
id: ClownSuit # ConstructionGraph: BananaClownJumpsuit
Expand Down
Loading