From 63b9cd0b92b77306c90d93ce1422e4575fbd83fc Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 12 May 2022 11:44:17 +0200 Subject: [PATCH] Adds suppermatter (#7633) Co-authored-by: metalgearsloth --- .../Objects/Consumable/Food/Baked/cake.yml | 57 ++++++++ .../Recipes/Cooking/meal_recipes.yml | 13 ++ .../Consumable/Food/Baked/cake.rsi/meta.json | 138 +----------------- .../Baked/cake.rsi/suppermatter-shard.png | Bin 0 -> 468 bytes .../Food/Baked/cake.rsi/suppermatter.png | Bin 0 -> 1697 bytes 5 files changed, 71 insertions(+), 137 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index 591bf1408b..f7be9c0efa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -617,3 +617,60 @@ - ReagentId: Omnizine Quantity: 3 # Tastes like sweetness, cake, jam. + + +# Suppermatter +# I can't figure out where to put this. It kind of acts like a cake I guess? + +- type: entity + name: suppermatter + parent: FoodCakeBase + id: FoodCakeSuppermatter + description: Extremely dense and powerful food. + components: + - type: Sprite + layers: + - state: plate + - state: suppermatter + - type: SliceableFood + slice: FoodCakeSuppermatterSlice + TotalCount: 8 + - type: SolutionContainerManager + solutions: + food: + maxVol: 48 + reagents: + - ReagentId: Nutriment + Quantity: 48 + - type: Food + transferAmount: 12 + trash: FoodPlate + - type: Item + size: 40 + - type: PointLight + color: "#FFFF00" + radius: 2 + energy: 1.4 + +- type: entity + name: suppermatter shard + parent: FoodCakeSliceBase + id: FoodCakeSuppermatterSlice + description: A single portion of power. + components: + - type: Sprite + layers: + - state: suppermatter-shard + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - type: Food + transferAmount: 3 + - type: PointLight + color: "#FFFF00" + radius: 1.4 + energy: 1.4 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index babd1290b0..b6e980b57e 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -603,3 +603,16 @@ time: 10 solids: FoodAloe: 1 + +# Suppermatter +- type: microwaveMealRecipe + id: RecipeSuppermatter + name: suppermatter recipe + result: FoodCakeSuppermatter + time: 30 + solids: + FoodCakeBatter: 2 + reagents: + Sugar: 30 + Nitrogen: 10 + Plasma: 10 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json index 50525ce7f2..ae32c43a05 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json @@ -1,137 +1 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "alpha" - }, - { - "name": "alpha-filling" - }, - { - "name": "alpha-slice" - }, - { - "name": "alpha-slice-filling" - }, - { - "name": "apple" - }, - { - "name": "apple-slice" - }, - { - "name": "birthday" - }, - { - "name": "birthday-slice" - }, - { - "name": "brain" - }, - { - "name": "brain-large" - }, - { - "name": "brain-slice" - }, - { - "name": "carrot" - }, - { - "name": "carrot-slice" - }, - { - "name": "cheese" - }, - { - "name": "cheese-slice" - }, - { - "name": "chocolate" - }, - { - "name": "chocolate-slice" - }, - { - "name": "lemon" - }, - { - "name": "lemon-slice" - }, - { - "name": "lime" - }, - { - "name": "lime-slice" - }, - { - "name": "orange" - }, - { - "name": "orange-slice" - }, - { - "name": "plain" - }, - { - "name": "plain-slice" - }, - { - "name": "clown" - }, - { - "name": "clown-slice" - }, - { - "name": "plate" - }, - { - "name": "plate-small" - }, - { - "name": "plate-plastic" - }, - { - "name": "plate-small-plastic" - }, - { - "name": "plate-slice-shading" - }, - { - "name": "pumpkinspice" - }, - { - "name": "pumpkinspice-slice" - }, - { - "name": "slime" - }, - { - "name": "slime-slice" - }, - { - "name": "christmas" - }, - { - "name": "christmas-slice" - }, - { - "name": "vanilla" - }, - { - "name": "vanilla-slice" - }, - { - "name": "trumpet" - }, - { - "name": "trumpet-slice" - } - ] -} +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": {"x": 32, "y": 32}, "states": [{"name": "alpha"}, {"name": "alpha-filling"}, {"name": "alpha-slice"}, {"name": "alpha-slice-filling"}, {"name": "apple"}, {"name": "apple-slice"}, {"name": "birthday"}, {"name": "birthday-slice"}, {"name": "brain"}, {"name": "brain-large"}, {"name": "brain-slice"}, {"name": "carrot"}, {"name": "carrot-slice"}, {"name": "cheese"}, {"name": "cheese-slice"}, {"name": "chocolate"}, {"name": "chocolate-slice"}, {"name": "lemon"}, {"name": "lemon-slice"}, {"name": "lime"}, {"name": "lime-slice"}, {"name": "orange"}, {"name": "orange-slice"}, {"name": "plain"}, {"name": "plain-slice"}, {"name": "clown"}, {"name": "clown-slice"}, {"name": "plate"}, {"name": "plate-small"}, {"name": "plate-plastic"}, {"name": "plate-small-plastic"}, {"name": "plate-slice-shading"}, {"name": "pumpkinspice"}, {"name": "pumpkinspice-slice"}, {"name": "slime"}, {"name": "slime-slice"}, {"name": "christmas"}, {"name": "christmas-slice"}, {"name": "vanilla"}, {"name": "vanilla-slice"}, {"name": "trumpet"}, {"name": "trumpet-slice"}, {"name": "suppermatter", "directions": 1, "delays": [[1.0]]}, {"name": "suppermatter-shard", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard.png new file mode 100644 index 0000000000000000000000000000000000000000..963b92ea3f0c0afaa488fd75c28aaef6bc7479b0 GIT binary patch literal 468 zcmV;_0W1EAP)Px$j!8s8R9J=WRl!QbKoEUOz?0yi@svY7rey`MUNnXLLZx>`Y96sKnmhP z@B=~;@L*C2J=7rDo+N?wu)ED#q}gbTmwgbJS$1dU&D)&-8X6k^jIDJADk8@OfGo&y za2C9(p4(ni@(zHh_!6IVRL}mo1DyHPuw4K^8IOK6(SfsU?0%V=J4M^;n1m0#kP%*vZi4cA~9-n}-2Rr~C%D5+Y!2CJd zFAAt|#ghSVFY|l0=J9ogEXdLB4*(!+@)~MUL{6uO97^esQc7uMGe7YOEh2{|KA{Xl zn)rk!K3UlbL$v^*t%VT`oB7Ok7keIVpK*GTqKtdUf*k2&RvTBT0L~(`NQ)H`TuWMe zNN)}$zmj8bcc*)F{ zyUyjfwgBZ(%x`qKYLBFO*SQ==DsdbA3+isPC_sg|hK7cQhQJr(v&u4hqtF@v0000< KMNUMnLSTX>naRum literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter.png new file mode 100644 index 0000000000000000000000000000000000000000..f8e744064e7e4156469f6ad5ca8828ab4fc5b110 GIT binary patch literal 1697 zcmV;S244AzP)Px*TS-JgR9J=WmR)R{R~g5D?|BoGr0!D3NgO-zN50df>jfl%stvB2Z5?9OU?>yI zCczCtT+mkA1vk55lK=@p#y}GSq+QU`s!Wt^MO#_onyf7(1<`c*Xp-i`iDNroEQyn~ zwcm5N@W;}`**f5k{iP$nKIc5=`JdguYB#hzDheBY{+ zqFO1cX8%wfOANNGt2@tbsJqW?sM{wu5`!(VR3!f62$%rd;H#dXyQ7oD@Ws^h51Br9 z27t>yFBx!`KY+d7qUm)$jL{wd^ja^eNPMhLb|PQ`Y~yDeg6=0C$GG_px~>BtgrGOD zfRqwZS5WZ4Gf%LtX&C?LL2r0Cd9~F$7%_!q`A90q*Qns6jI9MP>R{}ui@?(KyNaklmdAYv?cH)fNLh82*?G@E7w}brIc7&uepFI za5ozP^T?^{pyScUFvkDF?2QEgocl|WQYM`MUZ0Ii{wOGgJo_M?CkFt7;Q7xo|Nb2S z4j-rNm2c+v)jU{8b6W+uH3!j*1jdjytT*;McOsA*Ufe+a>2;I=<@<_v$kJvg;zK?n zBg;%ouONg#O39lqSo@sSP*GffUiSuwE|3b6`pC_e0ux}au$d{Xv7qZZhG78QqXA#L z11SxTwA%^zqX;1=-&f4!%o@IDzk?d>&e&ajCx~;ujriy>M8gGO3E_z==#RtpPG}xG zQ#)Q#y$7WfhGC$TLMcV?dX$-g1(f<8QW`j#tVpRcT8IoUBb6dP^fp>ud&W*02Epr5 z^!g(hqsN$g>lj+WFZKfKTM3v*HkXVs!0e3$W^XJ|zONW}$5UMTsRwsQXKG#1`Q4_Z z4iu2GOAKE`Z|F`|1>pMHlZ0OXJ%8_=rQw-d83Cqqk<6l^XyjD&lD*!Fl#3#XvR5=R?_@nsR9rXU}R~$TA znK2f+ju3*G*Ulh>PH$iVug`|ibs|f*w>eK^TNO-)S7~mmU}j(eAvC1?Fqi3^`@838 z^On;4)&u~Dj#g&Y1O7;+3ZzWhd5=e0(;8z_6WW%7o-X@RdFd{0O}&q+%$zxBDzrwG zvyh(dFaWv`7*cZBX9LK(-sUaI%uj|^$uSAO;PX(}+?R=jrrk@x1lW4I96`G^kBQ(a z-V@(ODMg^`mpeL0qsm!`lrotPA()t1$>`<4!*2AtKO*FhiI4YUX}x9zmbVgsWF6GCMR+!_&7i1hT$}93}a@+Z)AIR)EWH#@`*z^nYhhwq5(jcD|Dwd18VdpK~Qn1DYD zDALbGcU=J?gsyYoAr}DiV=LGn`4YzD6$+dCtiW={ zc@_=a1){!_VHZGuV2beK2A=wS^c)RMXnZDLV9FDqfl7)p=sPjzs;J5%GP+E4Wnsp7 zWOSLirF9Y$m(%4J+v0Cq1ky;qUUE0hnR~kI