From 3b54566e5b325cb40b58998ddeca7fc1de37fc69 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Wed, 11 May 2022 08:17:24 +0100 Subject: [PATCH] Changs chinese food vending machine (#7754) * new chinese food items from paradise * made soy sauce salty * new snacks based on the new assets * chang assets 1 * chang vending machine * rsi animation and fix * rsi path fix * misc changes * fortune cookie snacks complete with fortunes * Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml darn Americans Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --- .../en-US/advertisements/vending/chang.ftl | 4 + .../VendingMachines/Advertisements/chang.yml | 7 ++ .../VendingMachines/Inventories/chang.yml | 13 +++ .../Objects/Consumable/Food/snacks.yml | 101 ++++++++++++++++++ .../Structures/Machines/vending_machines.yml | 34 ++++++ .../Reagents/Consumable/Food/condiments.yml | 7 ++ .../Consumable/Food/snacks.rsi/chinese1.png | Bin 0 -> 362 bytes .../Consumable/Food/snacks.rsi/chinese2.png | Bin 0 -> 352 bytes .../Consumable/Food/snacks.rsi/chinese3.png | Bin 0 -> 372 bytes .../Consumable/Food/snacks.rsi/chinese4.png | Bin 0 -> 351 bytes .../Food/snacks.rsi/cookie_fortune.png | Bin 0 -> 219 bytes .../Consumable/Food/snacks.rsi/fortune.png | Bin 0 -> 298 bytes .../Consumable/Food/snacks.rsi/meta.json | 20 +++- .../VendingMachines/changs.rsi/broken.png | Bin 0 -> 546 bytes .../VendingMachines/changs.rsi/meta.json | 31 ++++++ .../changs.rsi/normal-unshaded.png | Bin 0 -> 618 bytes .../VendingMachines/changs.rsi/off.png | Bin 0 -> 486 bytes .../VendingMachines/changs.rsi/panel.png | Bin 0 -> 304 bytes 18 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/advertisements/vending/chang.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese3.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/cookie_fortune.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/vending/chang.ftl b/Resources/Locale/en-US/advertisements/vending/chang.ftl new file mode 100644 index 0000000000..34b6ece3ff --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/chang.ftl @@ -0,0 +1,4 @@ +advertisement-chang-1 = Taste 5000 years of culture! +advertisement-chang-2 = Mr. Chang, approved for safe consumption in over 10 sectors! +advertisement-chang-3 = Chinese food is great for a date night, or a lonely night! +advertisement-chang-4 = You can't go wrong with Mr. Chang's authentic Chinese food! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml new file mode 100644 index 0000000000..59e16a011d --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml @@ -0,0 +1,7 @@ +- type: advertisementsPack + id: ChangAds + advertisements: + - advertisement-chang-1 + - advertisement-chang-2 + - advertisement-chang-3 + - advertisement-chang-4 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml new file mode 100644 index 0000000000..6b7c3756f9 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -0,0 +1,13 @@ +- type: vendingMachineInventory + id: ChangInventory + name: Mr. Chang + animationDuration: 2.1 + spriteName: cigs + startingInventory: + FoodCondimentPacketSoy: 5 + FoodSnackCookieFortune: 5 + DrinkRamen: 3 + DrinkHellRamen: 3 + FoodSnackChowMein: 3 + FoodSnackDanDanNoodles: 3 +# rice? \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index fd7994f563..4ae08470c6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -189,6 +189,73 @@ color: white - type: Food trash: FoodPacketSyndiTrash + +- type: entity + name: chow mein + parent: FoodSnackBase + id: FoodSnackChowMein + description: A salty fried noodle snack. Looks like they forgot the vegetables. + components: + - type: Sprite + state: chinese1 + - type: Item + color: red + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 # Room for extra condiments + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Soysauce + Quantity: 2 + - type: Food + trash: FoodPacketChowMeinTrash + +- type: entity + name: dan dan noodles + parent: FoodSnackBase + id: FoodSnackDanDanNoodles + description: A spicy Sichuan noodle snack. The chili oil slick pools on top. + components: + - type: Sprite + state: chinese2 + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 # Room for extra condiments + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 2 + - ReagentId: Soysauce + Quantity: 2 + - type: Food + trash: FoodPacketDanDanTrash + +- type: entity + name: fortune cookie + parent: FoodSnackBase + id: FoodSnackCookieFortune + description: A boring cardboard tasting snack with a fortune inside. Surprise! You're boring too. + components: + - type: Sprite + state: cookie_fortune + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + size: 1 + - type: Food + trash: FoodCookieFortune - type: entity name: nutribrick @@ -399,6 +466,40 @@ - type: Item color: white +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketChowMeinTrash + name: empty chow mein box + components: + - type: Sprite + state: chinese1 + - type: Item + color: red + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketDanDanTrash + name: empty dan dan box + components: + - type: Sprite + state: chinese2 + - type: Item + color: white + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodCookieFortune + name: cookie fortune + description: "The fortune reads: The end is near...and it's all your fault." + components: + - type: Sprite + state: fortune + - type: Item + color: white + - type: entity noSpawn: true parent: FoodPacketTrash diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index aad7d8d8c8..abad938b39 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -806,6 +806,40 @@ energy: 1.6 color: "#326e3f" +- type: entity + parent: VendingMachine + id: VendingMachineChang + name: Mr. Chang + description: A self-serving Chinese food machine, for all your Chinese food needs. + components: + - type: VendingMachine + pack: ChangInventory + - type: Advertise + pack: ChangAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/changs.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - texture: Structures/Machines/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ffe599" + +# job clothing + - type: entity parent: VendingMachine id: VendingMachineHydrobe diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index aca470909b..8b55870946 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -61,6 +61,13 @@ desc: A salty soy-based flavoring. physicalDesc: salty color: saddlebrown + metabolisms: + Food: + effects: + - !type:SatiateHunger + factor: 0.5 + - !type:SatiateThirst + factor: -0.5 # high salt content - type: reagent id: TableSalt diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png new file mode 100644 index 0000000000000000000000000000000000000000..b806e1d43986c3a7ab530aa020ff45a2c5e82748 GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*OxP1wzs#tySr;@Xxw68 z_|IVczp(Hw149D?gO;Y|hYuG2{~Q1KpLF2Bf&T`^m>h-Nve$S4e22oH#l&Y|4z;T#4G+ zJAUnK@MU9|cu871E{UlEXm7Eni(`n!#N-5tD-D4sZ`@#rbYSS1Iq`>2f{Gw6!U%PWa%->$*);C!kO1fz+d*iw6xRFfbf5(J({UU|Nqz4()!O}T*)AD;J|_Zm6cULcb@@jVJr#q3ubV5b|VeQ$*Bs7C~-+G zPAM56C74hRQml(aKXo~Pqe&swa%S6AG{&d;G*$^M>^+yG*2=V_4Mwr zFb*=lZ0w~l=h37ilR^}NH7%8m^|xAF_2}$2R^7ZpLL=qG(V1aWX3XYF)YjhdYiENm z8^gq}(lX4Rb3x9}_jGX#(U_Q=AaSK3@Z^mfl93J!E)ohqd=e%}DlTAH_`qw%p;MO| z6atv^1S026n>kI4RXm}Ai{k+6HaUCC;%8f0Ih-T=Z1RzbwG vL2;RmuIS0I4GtPz4iQ-y3lugn++}2lJgORdE8#{6&}s%xS3j3^P66qz< zhlfW;M=2;MDk&-200930GyidM|1dM%004jh04pjg@bEbQ|1-eA!1(`SWdHy%Ah%Kg z0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DLErEFSR(;Sc!`>C9|j) zC}haRnO2mTn+jnoE4cc(fK3Jfk{BBu+L$k40001YNkl$0000na**OxP19yoBIy}eyiL*wh$ zumAu5-?C+kmZs)i28RCz#{VlT|1%iZ-LY!`s%I<-@(X5gcy=QV$jPY+i70VNElw`V zEGWs$&tqVym=hdUP*nQ;OK`!*uTQkRb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(urLlX zzHIEJFz3;vBa=cDf;BCbjrF%$Ty^Q}HdfudLP8_u#L<~yQ)bNOO4Qcg@oQ&;FB`)o zYiYS}vB$mw?Je|laSYLzn4BPSr6JJcna**OxP1Zp{@rQ?K}Qk>$j2 zfqN5;KW$9>b-eRRmtjS)!P9A`yQ;KLPPlyqsGhMT$S;_|;n|HeAScz+#W6%?@ynKOGXu&g)5JomfN1p$@It&b&j)LqWt0t5H PEoAU?^>bP0l+XkKpr%U2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f5e56d4fa946006a57aa61b9d1777fdf61b76c GIT binary patch literal 298 zcmV+_0oDGAP)Px#Ksmb8&ES^8~q8JJm(0=oJL1gG6IR z`!Axy`yiw|!ux)tFCYklAbf#5ONzQ@`@fLd^jt}UFuK=I`;^NWM$=hk|He1)PO6kb zYt3Ps;`vRx){vT2CeM;0j^n4=ad$iGO#De`zD+&P61M@4yXOG5upG*+)eTWOBzcw; zo)3d@#9^BfgpXY*1%TEX;N|}hCys~E4Bc|Q0bsS56NC|`eF}i*!{ywhW6K*bLW3=> w^YmH;DAPsSD1Zr3u62>N!pXA|1VQ*muJxPrLzPLc*#H0l07*qoM6N<$g6utkd;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index 5bc79c8af0..d2fa0235ad 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide", "size": { "x": 32, "y": 32 @@ -28,6 +28,18 @@ { "name": "cheesiehonkers-trash" }, + { + "name": "chinese1" + }, + { + "name": "chinese2" + }, + { + "name": "chinese3" + }, + { + "name": "chinese4" + }, { "name": "chips" }, @@ -51,6 +63,9 @@ "name": "chocolatebar-inhand-left", "directions": 4 }, + { + "name": "cookie_fortune" + }, { "name": "energybar" }, @@ -141,6 +156,9 @@ }, { "name": "tatortot" + }, + { + "name": "fortune" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..506d3b065e2cdecd91ac2da95560d32ac62871da GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|S^|7RTn`*L z&|%8-rC04jjM)DpzLolnbF3I1Ry+JU;re2a_xl6x|F0w+-cY`vKf1$&p+c9T;mYIU z6W8a@pI=z$Gj;0JL?NMj_wHT0cJ0THA8+2gSt%}l{P=NWC8c2ZfMP+0nl!u8Wc!K~ zyVgRV;!MxDP|L{3NTAI?(9qD(+S~6k$rTv5BUcK&(BZezj_UV?3*6`2!8f+hZ?YHoO)0Wry6Q`WsnK|oOW!*!b z44&N=j=Q|$nsNL<;t>IZ&1Z}mn5x7Wp64+X^MB#kG;>)duK?o;&UFt{H#T^tpKx^G zd&BlZDnmAe$z`z)1JjD5n|=s!NJMb0$la^Ys5w#pP5zdGfCKtU?y=cD7nusqNmdyy zPhkwYl*{zN-buHEDTqnkG$=_s>C;K>4|c_UOI??hI$YAq-0;51-_XJA{@(tQ94(eT zyOrM`YRP7u$*K2DIneJO!=eh8|8pG;ukQcEe!fA&h}E<3KPap{UHx3vIVCg!0A~sO A2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json new file mode 100644 index 0000000000..1da3cf0661 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, modified by Peptide", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..e338b4c7458eaf1ca3b6f76f1d20cd015ca33c53 GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^2|(rxB3BaR z7tHV6`~Ul#+#ts8xju^~?$X`= zYQ-h}->V;UNj9uocYn!o0}HN(%vsMW&(+At28q9>nVWRM1jCa57vk9+SQ$haL>NC9*lGrx_}ln?@8>$(DZeAWI3E!BvruM( z?4tLU51z0e<-hGJb--QzvD}yFV*4Ww^ISNj6!M;UW;9G?oTvQhKbLh*2~7Y1x+gsV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..01de7afea4472e555ade09326ecc977397399a6f GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|S^|7RTn`*L z&|%8-rC04jjM)DpzLolnbF3I1Ry+JU;re2a_xl6x|F0w+-cY`vKf1$&p+c9T;mYIU z6W8a@pI=z$Gj;0JL?NMj_wHT0cJ0THA8+2gSt%}l{P=NWC8c2ZfMP+0nl!u8Wc!K~ zyVgRV;!MxDP|L{3NTAI?(9qD(+S^ z*Hqgz{@VvUas9EU>%4V9TxZ6P?8EIDGVa-Lx87lv*xT{J*ugy^Pe*CPG$*DT29LHX z^L~+L2o1f;bb-ku*wlA2OUHJThGXv+q%H7cP+Bq7i-||RzLnwJ%;Sf1Js&(Tulr`l zy64lL+5V?rupC+Z%#8KHp%#nQ#>vxpl&3vnH q$u;w%L*beJ$WIy#1ihISe= zUc2wEqN0+Ll2Tq?URGAt*4B22fx*kmt3sC{N0TAH@?QW@BV$RBUoeBivm0qZPJUHL zM2SmkadJ^+K}lwQ9s@(goZzs6qSEhQf(t%=eWK;9t99jJaWn(XeIgchCnG~WBtZAuisBgPZ!BF4Sy|dd`b@K`djjR(#XNFCgF`Fw< zTYJZ^oejL~41c!BR5NZ^c@Jo{nWu|mh{nX^1PMNefD<N!kb#Mvy-kpfA!#o6U4G$iOP~o1p00i_>zopr01rZH9{>OV literal 0 HcmV?d00001