]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
rouny meat and steak (#20526)
authordeltanedas <39013340+deltanedas@users.noreply.github.com>
Thu, 28 Sep 2023 04:07:08 +0000 (05:07 +0100)
committerGitHub <noreply@github.com>
Thu, 28 Sep 2023 04:07:08 +0000 (00:07 -0400)
* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny.png [new file with mode: 0644]

index 145e2aa51f0aa6e90732d2e9fb585ab699c3f05a..8ecf4cb13e75118ec7ba53f6805f754dae2cb259 100644 (file)
@@ -148,6 +148,7 @@ flavor-complex-parents = like someone's parents
 flavor-complex-plastic = like plastic
 flavor-complex-glue = like glue
 flavor-complex-spaceshroom-cooked = like space umami
+flavor-complex-lost-friendship = like lost friendship
 
 # Drink-specific flavors.
 
index 1c81d57e69ee424b7a37a55232ffd4ca80a331a1..47ea55278fb47e2fc3f2a8b36c70ad6cda5d1f66 100644 (file)
     drawdepth: Mobs
     sprite: Mobs/Aliens/Xenos/rouny.rsi
     offset: 0,0.6
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatRouny
+      amount: 3
 
 - type: entity
   name: Spitter
index 44f2b668e4db28210307fbda9a141cc281a42918..1c003df38e679c696b5b404a59d1239832726a30 100644 (file)
     count: 3
     slice: FoodMeatXenoCutlet
 
+- type: entity
+  name: raw rouny meat
+  # not raw since rouny best
+  parent: FoodMeatBase
+  id: FoodMeatRouny
+  description: A slab of meat from an innocent red friend.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - meaty
+    - acid
+    - lostfriendship
+  - type: Tag
+    tags:
+    - Raw
+  - type: Sprite
+    state: rouny
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: SulfuricAcid
+          Quantity: 20
+  - type: Construction
+    graph: RounySteak
+    node: start
+    defaultTarget: rouny steak
+
 - type: entity
   name: killer tomato meat
   parent: FoodMeatBase
     graph: GoliathSteak
     node: goliath steak
 
+- type: entity
+  name: rouny steak
+  parent: FoodMeatBase
+  id: FoodMeatRounyCooked
+  description: Some kill to survive. You on the other hand, kill for fun.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - meaty
+    - lostfriendship
+  - type: Tag
+    tags:
+    - Cooked
+  - type: Sprite
+    layers:
+    - state: rouny-cooked
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Protein
+          Quantity: 10
+  - type: Construction
+    graph: RounySteak
+    node: rouny steak
+
 - type: entity
   name: lizard steak
   parent: FoodMeatBase
index 2b8e2b0e2f09bf0eaa14379afeb3f82e34bc8ba3..fc3b0ba5771a75452fea89bf99287f1f1e2b9333 100644 (file)
 - type: flavor
   id: spaceshroomcooked
   flavorType: Complex
-  description: flavor-complex-spaceshroom-cooked
\ No newline at end of file
+  description: flavor-complex-spaceshroom-cooked
+
+- type: flavor
+  id: lostfriendship
+  flavorType: Complex
+  description: flavor-complex-lost-friendship
index 76159ec5ac4085986203116a2d91ed913187c9c2..74854084f5391ea6ac1887b3c45eb9ae02637257 100644 (file)
 
   - node: goliath steak
     entity: FoodMeatGoliathCooked
+
+# rouny steak
+- type: constructionGraph
+  id: RounySteak
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: rouny steak
+      steps:
+      - minTemperature: 445 #rouny
+  - node: rouny steak
+    entity: FoodMeatRounyCooked
index 2bbe89d1f9faea4a7456ef5cfc1cc5026c4849fa..f1aa4d3446dd1a0c402c4f284906fe526eecef7e 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",
+  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
   "size": {
     "x": 32,
     "y": 32
     },
        {
       "name": "dragon_veins"
+    },
+    {
+      "name": "rouny"
+    },
+    {
+      "name": "rouny-cooked"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png
new file mode 100644 (file)
index 0000000..cba050d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny.png
new file mode 100644 (file)
index 0000000..bf87e1b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny.png differ