From 149e58d30a9b0168a53b3efd8b9c03a3ff2430d9 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Thu, 24 Aug 2023 07:49:25 +1000 Subject: [PATCH] revamp getmore inventory (#19372) --- .../VendingMachines/Inventories/snack.yml | 8 ++- .../Markers/Spawners/Random/trash.yml | 1 + .../Objects/Consumable/Food/snacks.yml | 58 +++++++++++++++++- .../Consumable/Food/snacks.rsi/cnds-trash.png | Bin 0 -> 339 bytes .../Consumable/Food/snacks.rsi/cnds.png | Bin 0 -> 373 bytes .../Consumable/Food/snacks.rsi/meta.json | 14 ++++- .../Consumable/Food/snacks.rsi/pistachio.png | Bin 0 -> 481 bytes .../Consumable/Food/snacks.rsi/semki.png | Bin 0 -> 308 bytes .../Food/snacks.rsi/syndicakes-trash.png | Bin 385 -> 305 bytes .../Consumable/Food/snacks.rsi/syndicakes.png | Bin 256 -> 252 bytes 10 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 3285384cc2..b797f588fe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -3,8 +3,10 @@ startingInventory: FoodSnackRaisins: 3 FoodSnackChocolate: 3 - FoodSnackPopcorn: 3 + FoodSnackCnDs: 3 + FoodSnackPistachios: 3 + FoodSnackSus: 3 + FoodSnackSemki: 3 + emaggedInventory: FoodSnackSyndi: 3 - DrinkRamen: 3 - DrinkHellRamen: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index e529df937b..60a7098328 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -21,6 +21,7 @@ - FoodPacketChipsTrash - FoodPacketChocolateTrash - FoodPacketChowMeinTrash + - FoodPacketCnDsTrash - FoodPacketDanDanTrash - FoodPacketEnergyTrash - FoodPacketPistachioTrash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index fb02a92949..9c6d4a73fa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -42,6 +42,21 @@ - type: Food trash: FoodPacketBoritosTrash +- type: entity + name: C&Ds + parent: FoodSnackBase + id: FoodSnackCnDs + description: Legally, we cannot say that these won't melt in your hands. + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: cnds + - type: Item + - type: Food + trash: FoodPacketCnDsTrash + - type: entity name: cheesie honkers parent: FoodSnackBase @@ -153,6 +168,22 @@ state: energybar-open - type: Item +- type: entity + name: sweetie's pistachios + parent: FoodSnackBase + id: FoodSnackPistachios + description: Sweeties's name-brand pistachios. probably won't give you diseases. Probably. + components: + - type: FlavorProfile + flavors: + - salty + - nutty + - type: Sprite + state: pistachio + - type: Item + - type: Food + trash: FoodPacketPistachioTrash + - type: entity name: popcorn parent: FoodSnackBase @@ -187,7 +218,22 @@ trash: FoodPacketRaisinsTrash - type: entity - name: Sus Jerky + name: bob's semki sunflower seeds + parent: FoodSnackBase + id: FoodSnackSemki + description: Proudly produced by the Bob Bobson nutritional corporation. Perfect for spitting at people. + components: + - type: FlavorProfile + flavors: + - nutty + - type: Sprite + state: semki + - type: Item + - type: Food + trash: FoodPacketSemkiTrash + +- type: entity + name: sus jerky parent: FoodSnackBase id: FoodSnackSus description: Something about this packet makes you feel incredibly uneasy. Jerky's good though. @@ -413,6 +459,16 @@ state: boritos-trash - type: Item +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketCnDsTrash + name: C&Ds bag + components: + - type: Sprite + state: cnds-trash + - type: Item + - type: entity noSpawn: true parent: FoodPacketTrash diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..0f622e08f7ec2df3739943a65231496209b185c5 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUCkDEnDM~t$8+YU5|7EcOWd+p^D)K#k&h2f}iyh4OUwydy=)-DP z>o{d8ppL}q|BHbXe@T#E@P8D*aOKX7g+M9J0*}aI1_r*vAk26?e?mNk6ll}h5`x&2J! ze?zsVVfp>{3oH+pbp}=3y4n4nDZxIg^O87^ber1Y(}nd6`+@fGFWAcbzT5D@ldH>q Q1Kr2q>FVdQ&MBb@03Xzd+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png new file mode 100644 index 0000000000000000000000000000000000000000..9747f62a5196f2ab9e189c85c6af0886a22e5848 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbU=SKMS_&Jw5SxyXet#-9OQfgEJRO8jh`?CAB0-HJ>Jnl8^uZ 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 d2fa0235ad..116e05d18f 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, chinese from paradise, ticket by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x", "size": { "x": 32, "y": 32 @@ -63,6 +63,12 @@ "name": "chocolatebar-inhand-left", "directions": 4 }, + { + "name": "cnds" + }, + { + "name": "cnds-trash" + }, { "name": "cookie_fortune" }, @@ -116,6 +122,9 @@ { "name": "peachtinmaint-open" }, + { + "name": "pistachio" + }, { "name": "pistachio-trash" }, @@ -139,6 +148,9 @@ { "name": "raisins-trash" }, + { + "name": "semki" + }, { "name": "semki-trash" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png new file mode 100644 index 0000000000000000000000000000000000000000..bcc453be10a27079f06b6819a80a4993eccd520a GIT binary patch literal 481 zcmV<70UrK|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0d`45K~z{rV;BXa zU=)mkfd-6F8ZU@kX8K>tUy|Y4#^(%#=;cwTi82!g2r33y?!fz>K~^-&Fvq-X#gF7d=0bMTJblSech9v`q|LSRFuJ3l^-0$ zAR1&bh(3Cs6>RyN7f--!Y>p%Zh;qQG$LwHB{4K@7e2`B;J_d<_Xps2X+aK}fii^{1 zu}Tu<05jR2V4s3~39=9bKx_~IIcCzXZv?ZXe%4{ES%jnz0QnMRA+XDJf%ikT@k2u z=M=LRAjMk}^Mb0;m{NLcOI9`{ttiGg8L?>q(% zkxl^{#)(QUPUZ*mbPm31zA%H^EG}JdgNmeU$rhX2OKDk^F~nV2V0hCqtFB*-rqC<_D(Qr^sNKq1ZokH}&M2EM}} z%y>M1MG8=GlBbJfh=u>#iMP3040!5YZZCQJzy8y?GqVDEH}KnWRtpFlEf?RiR{l?` z{(51lo2xq7Hv4UI69~P`5G43bcUI)QiB}tR%-$$>RGm3{=kA{{2Pd`FVdQ&MBb@064^Tw*UYD delta 369 zcmV-%0gnE$0)YdN8Gi-<0047(dh`GQ0Z2(iK~#90?Uuo9#2^qwhbVo(1-XE639HnQ z5>rF82NwVZY@CCsgj_uKK+J%56|EHUFUDh-_XjYxnx+Y!sh6kHyMbaggF($V3eQixh?PXb%^c(;{Yfa50el)gfz!(!*!e2=VvbZQ(EFs~G2gm*i@+?rG}K-F72z&zi;+5tYkzlz2z1JjsV^`ZeTN?3|< zlh^BK(occ|2z%h@V{*B?ZJ-j6U^HHWiw0Uv)c`e}Itd?z9qE7mketyE#C5YcM#S5Q P00000NkvXXu0mjfX2GRz diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png index 1b45ff7bbd5ac5f33e3ba4af09e752afa97b17e1..af19280faff460989eb48bcf1b125ba12acacb44 100644 GIT binary patch delta 235 zcmZo*`olOuvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=$Az$e7@ z%$YO)|NnpW>eU$rhX2OKDk^F~nV2V0hCqtFB*-rqC<_D(Qr^sNKq1ZokH}&M2EM}} z%y>M1MG8|lrzaXh_-8QHfzYBJP{J$L(LU0_%asEuSY+`0PLoB8AqIb236VXq?wbtP~)c`uz z3RobbVU4#FnAyF_z>zKL$0o~X$Hi;_!Z~N#KBEznfi1=+Txd!N>)PTFc6olrTZ|?X z7n4l@@lslh97YfuF-;(gJVuL2pkvVGQ$9go@a#jV!ptHfvMjgV3PySV95ufBoAw5d p#kIBH&&;a0I?tJRfa5q0xC3|OxS^HG6m$Rp002ovPDHLkV1h-SY#;yt