]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Added 18 new bounties to cargo (#26160)
authorwafehling <wafehling@users.noreply.github.com>
Sun, 17 Mar 2024 17:06:16 +0000 (12:06 -0500)
committerGitHub <noreply@github.com>
Sun, 17 Mar 2024 17:06:16 +0000 (13:06 -0400)
commit4357b9ef08fee0e08c4fdf4eeef714fa8eb38112
tree0f64e6e585305811cde19bd078fb1c86c7c9df8a
parentf259f2f3a21127427ae7f026e16694fcdfe14583
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
19 files changed:
Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
Resources/Locale/en-US/cargo/bounties.ftl
Resources/Prototypes/Catalog/Bounties/bounties.yml
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
Resources/Prototypes/tags.yml