From 9ac0a214820b9f0ee8e3072ce90656df535ac0a2 Mon Sep 17 00:00:00 2001 From: MutantMan2040 Date: Sun, 7 Jul 2024 23:42:29 -0800 Subject: [PATCH 1/4] Added Can opening too Dog Food + Added a special brand of dog food Added Can opening to dog food, aswell added a new variant of it. The fog food now has three states, closed, open, and empty. It functions the same as canned peaches from upstream. the open sprite was fixed, as the top was bigger in the open sprite, than it was in the closed. a empty sprite was added aswell for the third state. 3 new sprites were added for the Dinki-Di Dog Food object, its a fun referance to another very popular Post Apocalyptic franchise. --- .../Objects/Consumable/Food/pre-warfood.yml | 111 +++++++++++------- .../Consumable/Food/dinkidi.rsi/icon-open.png | Bin 0 -> 681 bytes .../Consumable/Food/dinkidi.rsi/icon.png | Bin 0 -> 668 bytes .../Consumable/Food/dinkidi.rsi/meta.json | 20 ++++ .../Consumable/Food/dinkidi.rsi/trash.png | Bin 0 -> 612 bytes .../Consumable/Food/dogfood.rsi/icon-open.png | Bin 0 -> 728 bytes .../dogfood.png => dogfood.rsi/icon.png} | Bin .../Consumable/Food/dogfood.rsi/meta.json | 20 ++++ .../Consumable/Food/dogfood.rsi/trash.png | Bin 0 -> 650 bytes .../Food/pre-war.rsi/dogfood_open.png | Bin 733 -> 0 bytes 10 files changed, 111 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon-open.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/trash.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/icon-open.png rename Resources/Textures/_Nuclear14/Objects/Consumable/Food/{pre-war.rsi/dogfood.png => dogfood.rsi/icon.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/trash.png delete mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood_open.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml index 6db0f9bc647..829efc34c62 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml @@ -67,7 +67,7 @@ Quantity: 2 - ReagentId: Theobromine Quantity: 3 - + - type: entity name: Cram parent: N14FoodSnackBase @@ -89,7 +89,7 @@ state: crisps - type: Food trash: N14FoodCrispsTrash - + - type: entity name: Dandy Boy Apples parent: N14FoodSnackBase @@ -100,30 +100,61 @@ state: dandyapples - type: Food trash: N14FoodDandyboyapplesTrash - + - type: entity - name: canned dog food - parent: N14FoodSnackBase + parent: FoodTinBase id: N14FoodDogfood + name: canned dog food description: A can of beef stew meant for dogs. components: - type: Sprite - state: dogfood + sprite: _Nuclear14/Objects/Consumable/Food/dogfood.rsi + - type: FlavorProfile + flavors: + - meaty + - mushy - type: Food - trash: N14FoodTinCanTrash - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 7 - - ReagentId: N14RadParticleFood - Quantity: 1 - - type: PhysicalComposition - materialComposition: - Steel: 100 - + trash: N14FoodDogFoodTrash + - type: Tag + tags: + - Meat + - Soup + +- type: entity + parent: FoodTinBaseTrash + id: N14FoodDogFoodTrash + name: canned dog food + components: + - type: Sprite + sprite: _Nuclear14/Objects/Consumable/Food/dogfood.rsi + +- type: entity + parent: FoodTinBase + id: N14FoodDinki-Di + name: Dinki Di Dog Food + description: A can of Gen-u-ine premium dog food, a worthy meal for any road warrior. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Consumable/Food/dinkidi.rsi + - type: FlavorProfile + flavors: + - meaty + - mushy + - type: Food + trash: N14FoodDinki-DiTrash + - type: Tag + tags: + - Meat + - Soup + +- type: entity + parent: FoodTinBaseTrash + id: N14FoodDinki-DiTrash + name: Dinki-Di Dog Food + components: + - type: Sprite + sprite: _Nuclear14/Objects/Consumable/Food/dinkidi.rsi + - type: entity name: Fancy Lads Snack Cakes parent: N14FoodSnackBase @@ -134,7 +165,7 @@ state: fancylads - type: Food trash: N14FoodFancyladssnackcakesTrash - + - type: entity name: InstaMash parent: N14FoodSnackBase @@ -145,9 +176,9 @@ state: instamash - type: Food trash: N14FoodInstamashTrash - + - type: entity - name: Pork n' Beans + name: Pork n' Beans parent: N14FoodSnackBase id: N14FoodPorkBeans description: Beans stewed in a tomato sauce with chunks of cured pork belly. @@ -159,7 +190,7 @@ - type: PhysicalComposition materialComposition: Steel: 100 - + - type: entity name: mouldy food parent: N14FoodSnackBase @@ -181,7 +212,7 @@ Quantity: 3 - ReagentId: Ipecac Quantity: 2 - + - type: entity name: Salisbury Steak parent: N14FoodSnackBase @@ -201,7 +232,7 @@ Quantity: 9 - ReagentId: N14RadParticleFood Quantity: 1 - + - type: entity name: Sugar Bombs parent: N14FoodSnackBase @@ -223,7 +254,7 @@ Quantity: 1 - ReagentId: Sugar Quantity: 5 - + - type: entity name: YumYum Deviled Eggs parent: N14FoodSnackBase @@ -234,7 +265,7 @@ state: yumyum - type: Food trash: N14FoodYumyumdeviledeggsTrash - + # Trash - type: entity noSpawn: true @@ -254,7 +285,7 @@ - type: PhysicalComposition materialComposition: Cardboard: 100 - + - type: entity parent: N14FoodPacketTrash id: N14FoodTinCanTrash @@ -276,7 +307,7 @@ components: - type: Sprite state: blamco_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodBlamcomaccheeseLargeTrash @@ -284,7 +315,7 @@ components: - type: Sprite state: blamco_large_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodBubblegumTrash @@ -292,7 +323,7 @@ components: - type: Sprite state: bubblegum_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodCramTrash @@ -300,7 +331,7 @@ components: - type: Sprite state: cram_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodCrispsTrash @@ -308,7 +339,7 @@ components: - type: Sprite state: crisps_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodDandyboyapplesTrash @@ -316,7 +347,7 @@ components: - type: Sprite state: dandyapples_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodFancyladssnackcakesTrash @@ -324,7 +355,7 @@ components: - type: Sprite state: fancylads_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodInstamashTrash @@ -332,7 +363,7 @@ components: - type: Sprite state: instamash_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodSalisburysteakTrash @@ -340,7 +371,7 @@ components: - type: Sprite state: steak_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodSugarbombsTrash @@ -348,11 +379,11 @@ components: - type: Sprite state: sugarbombs_trash - + - type: entity parent: N14FoodPacketTrash id: N14FoodYumyumdeviledeggsTrash name: empty Yumyum Deviled Eggs box components: - type: Sprite - state: yumyum_trash \ No newline at end of file + state: yumyum_trash diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon-open.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..49242252c9eb3059626f4db7c4bdec615a2aab6e GIT binary patch literal 681 zcmV;a0#^NrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zOGZK~z{r?Uc`J z6HySyr%jX6-PJ^_Ayk6}D~f?yTM?qYSg?3eq=$lkfbpmmvEU!jQ|VRMllTuPJxKk5 zh*qS6tyKyhJXAsjYfG~>SxsUZ_dB~!f)z6lytyBE%)EKS%y-{=`zRzN73JmtjX`gw zi;&Z7ml_cZ0I7rh)YENp!w<_Pj$w`g-Y$LO938|03TtbW=hw{p+)jM7707Fw^JP zQ_U^QVvFX=#~MVcTnSMx3iSYcz^J%u&1?6K6Imnfw^&481__<9Vt zkpC4!PJK7KBDC(n?1i0Vtr%3?>(aYhZzvx3e?P}@D0}`S`&b*i_x0c30o-hRbd1g| zI&|@Vm98E?MbDnzrE5p}`54Zww9?erWy(DEUq>lgM_?qMYD2jaR~0u)L}BLh}Rt8qw3h!4?Eup7fD+hYXo P00000NkvXXu0mjf=LtIP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dinkidi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3483ac9b2577761f56e0c2f51078c3d5010894cd GIT binary patch literal 668 zcmV;N0%QG&P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0x?NMK~z{r?Uc`J z6HySyzimvQ$=W2e?jc&V)Kd%ES`n(fSWtRVq=$lkfbpm;r3L>0PsOXSC-EOpdXSb% zkXjE4{%FM>JSm|8W6EZwiEdU&cV_pMpkn4hZ|(;k-+42`o7wl?K14)B{P%Q(Dkh)L zH$(HUSeB)=rdBc)&*gG#$K!FN(`mMeN~OYDDwVXF=nS$B_G8mjwLu( ziukM+$1gQM4)(MCdjZ1@=H~{2`?33G2XpJIqP4XeApJ5n%=1(#g<7q~HZkB9S*iFh zqYDemO9$V8?Js<)0o?igfqffq3#_L{CRpztA40M5oo(q3i0{DiaIl^#ZWsnD6<0RJ zs7aM8LEJ#c4)F5i55!_Ip1*j$#7euMY>H71{HYoe+NvL?S+Rc;&rteP^d;)88vEJg(D&&0)RaaV9AH_SPNeO0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0r^QpK~z{r?UYL| zLs1aNr%Ds;r4@9624O{ldL`(Fq+&zFLgE9crALIs2e1-b$z6#rKrDn*L_8KGUJ)BB z(sbb!y`rTpsm}BsX*}m7cJ42^`Tx(E>6z&{=Uy-{F!=YFbY-{D)|5)d z;(othAAOD2>y>JPoyaLJkZB@AR~Aifx9+}&lamg+fza(OI0_1WEP%0&5)0*WVIRSa z$D25>DkuN3fD%oOn=6V)9}n+fe8&>mP0Cyxct{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0&Ph|K~z{r?Uqew z6JZdB-(>TjRAL&6sr9EsOKd4NMX468rFa%8COrrqLxoZh4?<6(2!eXH1O)NmL7{li zn~DW3BL20IN~*0&rBsaFG-(p!CRsD%ZUhnhR`g^Z2s5+$vh(ij@DbFhQ|G_Oq(xz3 zv6!l*za$=y8+xW8F*Q$3-{iclJ&g9Ajd(ek#8*YZ(&9V5?%x?PWI|X-%|n|Pu`-{9 zsnLSTBn|&`_%$M-aI;I zlAL!X-eCKaY3zHy%$j^Y&rt-!pCAwjz;rOERX-quvMh6Mv)MR`AZ)W5G8MRq|QXoV7VqEe}#R4TDXpOy&1N`0(K_0Uo8&cm{01Mh&eEW_Ke4KA09?-Le_ zMazDVumMN))C)y=Ij6TR+)m)jomo_7)11@dZ93M^8t0xC)`?(v2mFy9G!5;=>DM!8 zKDr-ciKl$6;ZPR}g@UFM$FKq7_}OvT?RK2Fa1{=RgFnyc`74G-uk%L+GMNl7TzG3U z*C#Js!|>tWe>;Ik$yJWDgx4>g!pM<6+<%eaYgVfjjD=GG0000< KMNUMnLSTZD)l9Yk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/icon.png similarity index 100% rename from Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood.png rename to Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/icon.png diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/meta.json new file mode 100644 index 00000000000..bfcbfd0dcc6 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "trash" + } + ] + } diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/trash.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/dogfood.rsi/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..6c40b9c3d430df5ce2e395a0c2798113bc5b7c98 GIT binary patch literal 650 zcmV;50(Jd~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0v}04K~z{r?UYMM zRACgy|IX`#AzJ5?T6KRgoO8bK&v*X!yJs#eEG+(es*ETm z9*^rrdMt@VLg`E;F*Q#nlSXws(P&i3gjgtPZlYqsW<(LKk%*C;o@hgZ84Cr(?aZ&?w|KiS9j4dTaXNwIy>h9HTHXHU^4{yNh^&*?ia!yc9 zXv-_mbsghxU;o`1pyotq?H#Ut{DQDQhvv;~&RbHSaAo}iy1wnQCYQ@`l%O<(L@*dc zRo^A(i=W|iI(d!E(J!4&bM11uI7$#3@cDck%jGicb~_M0gPQ)U(0fBDgfvtt6_iRP z)|j^?L98^dwOB0j(>u=B@(kE_)9^Q4hR5UKeZt{z7}=i@8*sPPBRts2IX!LuRSG{A zwoutR;G71p;cgFWs@u=8PJ;3b1P0r1_I3v*b~aIW=Q_qy8@yI?vjzEl-cZR=HbC5a zI1NqHaR13H+-^6&o{`5hN>^`kDg&8Jh6gTkp^od(XLA_p@BFtnu)6)7BMss6rw=fE zs~d0Lr+AJ2j?*vKP$(3*HnkGOUqXUD#}tQSH@Ml*OV07*qoM6N<$f=3P*c>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood_open.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood_open.png deleted file mode 100644 index 9f9134421c3c367715aafb9b5d26699ed545a2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 733 zcmV<30wVp1P)L{$ZPJgewRE*m%j`fq$JXLzbu#eaJm}p^ zJ$jP*H4oxJ526FXgC7?~nLWu44kio_f*uqn=)^B@x(cm?qLn#ZXlj}^rRj&sTT`a& zkjywy`anqD_j!2!zxR2cya|oJY%PEmKnq~S0I^uCzH}Uq$4#pOpbE3Ix0jvQ3!)1^ z5mAMELJ@?9I`QUl5@kuk{EvAhMh}E$03~s6R|Z)r4AWW~9c~*^&(m;pwxdI!uyM;e zWSKlnu9PkaT@}a+5fE>%pmkZ$@o(TEeZH*Os zEkwL1U$juc2i_+~v&I7`=JtA#NHw0@oqTh}Wk^U9;f8JH@|ZLlV1UiRoaK?-9wFmI ziuuVO>hC9a+w>FE>UC%}%>ZVzncO$byvEl(JBeVSP-yx$y_kj1=fg|+xmYY351^Xg z?}x|T5GX%O!eX(YR;v*}j^oI@)vCP$%hX0fC0TbNVb4l;NT8-qyB|KsZ?qtrL`AUbEI89^}5yvP`Z~O zB`@Dipe{F?Qf~2m4mO(&f&IH+UtGke&l%v6!2qgxqeEm14xG7)8)uIoHhK;5(WAsC zilW|hEBhKAJ~u{IeEi}~*zI<*J*Tcr;QHx Date: Mon, 8 Jul 2024 07:36:45 -0800 Subject: [PATCH 2/4] dogfood fix --- .../Consumable/Food/pre-war.rsi/dinki-Dis.png | Bin 0 -> 668 bytes .../Consumable/Food/pre-war.rsi/dogfood.png | Bin 0 -> 683 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dinki-Dis.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dogfood.png diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dinki-Dis.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/dinki-Dis.png new file mode 100644 index 0000000000000000000000000000000000000000..3483ac9b2577761f56e0c2f51078c3d5010894cd GIT binary patch literal 668 zcmV;N0%QG&P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0x?NMK~z{r?Uc`J z6HySyzimvQ$=W2e?jc&V)Kd%ES`n(fSWtRVq=$lkfbpm;r3L>0PsOXSC-EOpdXSb% zkXjE4{%FM>JSm|8W6EZwiEdU&cV_pMpkn4hZ|(;k-+42`o7wl?K14)B{P%Q(Dkh)L zH$(HUSeB)=rdBc)&*gG#$K!FN(`mMeN~OYDDwVXF=nS$B_G8mjwLu( ziukM+$1gQM4)(MCdjZ1@=H~{2`?33G2XpJIqP4XeApJ5n%=1(#g<7q~HZkB9S*iFh zqYDemO9$V8?Js<)0o?igfqffq3#_L{CRpztA40M5oo(q3i0{DiaIl^#ZWsnD6<0RJ zs7aM8LEJ#c4)F5i55!_Ip1*j$#7euMY>H71{HYoe+NvL?S+Rc;&rteP^d;)88vEJg(D&&0)RaaV9AH_SPNeO0000Pbv!HP;6x-ll%yw{!4U7|?I z#;sDx_ww7_8D>7enfdLm1^-x0fF?i_VB-NqA`y8ldo&ttSvLSm9t;Ng+G@4J?RIOn zWHPDw=z*vkKuu1GNrgfIrBVr^D8lFSY0t?=4}`7?EXHEkKQN%(ClU#GJRV*Ng7j=^ z3awsm-7)J1NGT?Fbz?0AXbX?>{U9PYni8i<3qcULJ?CzW Date: Tue, 9 Jul 2024 17:01:42 +0200 Subject: [PATCH 3/4] removes `dogfood` , `dogfood_open` from `meta.json` --- .../Objects/Consumable/Food/pre-war.rsi/meta.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/meta.json index 66a2f777840..d9289ca3f20 100644 --- a/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Consumable/Food/pre-war.rsi/meta.json @@ -232,12 +232,6 @@ { "name": "deathclaw_wellington" }, - { - "name": "dogfood" - }, - { - "name": "dogfood_open" - }, { "name": "fancylads" }, @@ -299,4 +293,4 @@ "name": "mirelurk_stew" } ] -} \ No newline at end of file +} From 643170c5890ebf12a19a0315d43197faa43890ba Mon Sep 17 00:00:00 2001 From: MutantMan2040 Date: Wed, 10 Jul 2024 01:33:52 -0800 Subject: [PATCH 4/4] Fikx --- .../Entities/Objects/Consumable/Food/pre-warfood.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml index 829efc34c62..cae01daa844 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml @@ -112,7 +112,6 @@ - type: FlavorProfile flavors: - meaty - - mushy - type: Food trash: N14FoodDogFoodTrash - type: Tag @@ -139,7 +138,6 @@ - type: FlavorProfile flavors: - meaty - - mushy - type: Food trash: N14FoodDinki-DiTrash - type: Tag @@ -292,7 +290,8 @@ name: empty tin can components: - type: Sprite - state: dogfood # TODO needs sprite + sprite: _Nuclear14/Objects/Consumable/Food/dogfood.rsi + state: trash - type: WelderRefinable refineResult: - SheetSteel1