Merge pull request impstation#1081 from ultramario1998/new-bounties

New bounties!
kipdotnet · Dec 22, 2024 · feccb5b · feccb5b
2 parents 8a2072e + 4fd894f
commit feccb5b
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 3 deletions.
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -77,6 +77,9 @@ bounty-item-bagels = Bagels
 bounty-item-bear-hide = Space Bear Hide
 bounty-item-muffins = Muffins
 bounty-item-suppermatter = Suppermatter
+bounty-item-crystal = Crystals
+bounty-item-mime-hardsuit = Mime Hardsuit
+bounty-item-spider-meat = Slab of Spider Meat
 
 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.
@@ -156,3 +159,6 @@ bounty-description-bagels = It's breakfast time.
 bounty-description-bear-hide = The Space Chicago Space Bears' mascot costumes were destroyed in a fire, and there's going to be a riot if Spacey The Bear can't make an appearance at the big game.
 bounty-description-muffins = We've got a load of civilians here from the syndicate who just lost their homes in a raid. Send us some muffins for our complimentary Apology Service.
 bounty-description-suppermatter = OH MY GOD NANOTRASEN HAS FINALLY MADE THE TECH AVAILABLE I CAN FINALLY POWER THE STATION PLEASE SEND IT TO ME NOW BEFORE WE GO OFFLINE PERMANENTLY
+bounty-description-crystal = The station-standard fluorescent lights are so dull, it's making the clown depressed. Send us some color, please?
+bounty-description-mime-hardsuit = ERROR: Automatic transcription failed! No data provided.
+bounty-description-spider-meat = H-hey... My mom disappeared on your station... Can you look for her? Um... If you find her, could you send her back home? Thanks... *sniffle*
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -784,7 +784,7 @@
   description: bounty-description-regenerative-mesh
   entries:
   - name: bounty-item-regenerative-mesh
-    amount: 60
+    amount: 30
     whitelist:
       tags:
       - RegenerativeMesh
@@ -828,7 +828,7 @@
   description: bounty-description-aloe-cream
   entries:
   - name: bounty-item-aloe-cream
-    amount: 6
+    amount: 30
     whitelist:
       tags:
       - Aloe
@@ -879,3 +879,41 @@
     blacklist:
       tags:
       - Slice #no cheating!
+
+- type: cargoBounty
+  id: BountyCrystal
+  reward: 10000
+  description: bounty-description-crystal
+  entries:
+  - name: bounty-item-crystal
+    amount: 12
+    whitelist:
+      tags:
+      - CrystalRed
+      - CrystalPink
+      - CrystalOrange
+      - CrystalGreen
+      - CrystalCyan
+      - CrystalBlue
+
+- type: cargoBounty
+  id: BountyMimeHardsuit
+  reward: 13000
+  description: bounty-description-mime-hardsuit
+  entries:
+  - name: bounty-item-mime-hardsuit
+    amount: 1
+    whitelist:
+      tags:
+      - MimeHardsuit
+
+- type: cargoBounty
+  id: BountySpiderMeat
+  reward: 7000
+  description: bounty-description-spider-meat
+  entries:
+  - name: bounty-item-spider-meat
+    amount: 3
+    whitelist:
+      tags:
+      - SpiderMeat
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -74,7 +74,7 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: advkit
   product: CrateEmergencyAdvancedKit
-  cost: 1200
+  cost: 2400
   category: cargoproduct-category-name-medical
   group: market
 

diff --git a/Resources/Prototypes/Datasets/corporations.yml b/Resources/Prototypes/Datasets/corporations.yml
@@ -27,3 +27,4 @@
   - "Frito-Lay, Inc."
   - "Hormel Foods Corporation"
   - "Coinbase"
+  - "Dahir Insaat"
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -1014,6 +1014,9 @@
   name: red mime hardsuit # Imp
   description: A custom-made mime hardsuit.
   components:
+  - type: Tag
+    tags:
+      - MimeHardsuit
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/mime.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -476,6 +476,9 @@
   id: FoodMeatSpider
   description: A slab of spider meat. That's so Kafkaesque.
   components:
+  - type: Tag
+    tags:
+      - SpiderMeat
   - type: Sprite
     state: spider
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -32,6 +32,9 @@
   name: black mime hardsuit
   description: A custom-made mime hardsuit.
   components:
+  - type: Tag
+    tags:
+      - MimeHardsuit
   - type: Sprite
     sprite: _Impstation/Clothing/OuterClothing/Hardsuits/mimeblack.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
@@ -930,6 +930,9 @@
 - type: Tag
   id: MimeHappyHonk
 
+- type: Tag
+  id: MimeHardsuit
+
 - type: Tag
   id: MindShield
 
@@ -1255,6 +1258,9 @@
 - type: Tag
   id: SpiderCraft
 
+- type: Tag
+  id: SpiderMeat
+
 - type: Tag
   id: SpookyFog