]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add Mothroach Burger (#24156)
authorTurboTrackerss14 <130304754+TurboTrackerss14@users.noreply.github.com>
Wed, 17 Jan 2024 08:46:33 +0000 (08:46 +0000)
committerGitHub <noreply@github.com>
Wed, 17 Jan 2024 08:46:33 +0000 (01:46 -0700)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering

Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/burger.rsi/mothroach.png [new file with mode: 0644]

index 58e6fc7bf2a546ff7c16382e83d3e327910e4f56..fb7edb0d4276d7251bc860b130d12a367e037a99 100644 (file)
@@ -157,6 +157,7 @@ flavor-complex-plastic = like plastic
 flavor-complex-glue = like glue
 flavor-complex-spaceshroom-cooked = like space umami
 flavor-complex-lost-friendship = like lost friendship
+flavor-complex-light = like a light gone out
 
 # Drink-specific flavors.
 
index 94cba00a5f72cc6cbdc69216702e8c9de1b2a6c5..22e6fce8e149a04b4749124a943276d156997d0d 100644 (file)
 
 # Note: I would put a bunch of colored burgers here as listed in the tg .dm but
 # I'd rather wait for a custom burger component.
+
+- type: entity
+  name: mothroachburger
+  parent: FoodBurgerBase
+  id: FoodBurgerMothRoach
+  description: The last lamp it saw was the one inside the microwave.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bun
+      - meaty
+      - light
+  - type: Sprite
+    state: mothroach
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Protein
+          Quantity: 4
+        - ReagentId: Vitamin
+          Quantity: 7
+  - type: Tag
+    tags:
+    - Meat
+    
\ No newline at end of file
index cf836cc273afb15a48cd94951232f93f7bc3afc6..57f37295d601f990e75f935bf2a46da62e243e07 100644 (file)
   id: horrible
   flavorType: Base
   description: flavor-base-horrible
+
+- type: flavor
+  id: light
+  flavorType: Complex
+  description: flavor-complex-light
+  
\ No newline at end of file
index c02a761bd718461997ae65d3795ca833b477593a..e2db2a0c655bf869c8104a3e2fd4b65504882c97 100644 (file)
     FoodBreadBun: 1
     FoodMeatXeno: 1
 
+- type: microwaveMealRecipe
+  id: RecipeMothRoachburger
+  name: mothroachburger recipe
+  result: FoodBurgerMothRoach
+  solids:
+    FoodBreadBun: 1
+    MobMothroach: 1
+
 #Breads & Sandwiches
 
 - type: microwaveMealRecipe
index c18c4b604060339e6ee7ae3ab7b9c9bdc12dfcec..5a7ffa873f391569ccfe34f3693cff7392abe5b0 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage",
+  "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage, mothroach.png created by TurboTracker",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "x"
     },
+    {
+      "name": "mothroach"
+    },
     {
       "name": "inhand-right",
       "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/mothroach.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mothroach.png
new file mode 100644 (file)
index 0000000..d1f8a2f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mothroach.png differ