From c32d19cf5ca49bf583054a72eb229f93dfc5b303 Mon Sep 17 00:00:00 2001 From: TurboTrackerss14 <130304754+TurboTrackerss14@users.noreply.github.com> Date: Wed, 17 Jan 2024 08:46:33 +0000 Subject: [PATCH] Add Mothroach Burger (#24156) * Add Mothroach Burger * append copyright * fix whitespace and metajson ordering --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../Objects/Consumable/Food/burger.yml | 29 ++++++++++++++++++ Resources/Prototypes/Flavors/flavors.yml | 6 ++++ .../Recipes/Cooking/meal_recipes.yml | 8 +++++ .../Consumable/Food/burger.rsi/meta.json | 5 ++- .../Consumable/Food/burger.rsi/mothroach.png | Bin 0 -> 393 bytes 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/mothroach.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 58e6fc7bf2..fb7edb0d42 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -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. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 94cba00a5f..22e6fce8e1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -891,3 +891,32 @@ # 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 diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index cf836cc273..57f37295d6 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -883,3 +883,9 @@ id: horrible flavorType: Base description: flavor-base-horrible + +- type: flavor + id: light + flavorType: Complex + description: flavor-complex-light + \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index c02a761bd7..e2db2a0c65 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -314,6 +314,14 @@ FoodBreadBun: 1 FoodMeatXeno: 1 +- type: microwaveMealRecipe + id: RecipeMothRoachburger + name: mothroachburger recipe + result: FoodBurgerMothRoach + solids: + FoodBreadBun: 1 + MobMothroach: 1 + #Breads & Sandwiches - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json index c18c4b6040..5a7ffa873f 100644 --- a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json @@ -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 @@ -173,6 +173,9 @@ { "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 index 0000000000000000000000000000000000000000..d1f8a2fe248b9dcde10c575d532a5e174d024e35 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP|zvBC&U#<+et)!r+qoIELVAt`bsaMu#>uISeDabt0_4o@kMXV&qFPPy!HW1R-yBMfq zpQnpsNX4A1lgM$W`Er`?O!f?= z4NujS9Mt}4ZOWa^vHM8J^xti&Z_)(T_tda(7*`+2m~fHVZ#$c-fQ`bBi>yf;`PMG{ z9tsUDiSAza9rQGW+5;A(u%GZUQBsltBPB9nO(xyK!$rm;ggNkuzK-M#vwy1Eo{;*yN<_ioSz&1HJoqh^XKXN`FqyP`*NGTx5nMO Q8|V`TPgg&ebxsLQ01~gIJpcdz literal 0 HcmV?d00001 -- 2.51.2