From 21166406d8f28f668fad768dea9c890d9db0c0d2 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 10 May 2023 11:36:47 +0000 Subject: [PATCH] condiment rework (#16247) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../VendingMachines/Inventories/chefvend.yml | 4 +- .../Consumable/Food/Containers/condiments.yml | 280 ++++-------------- .../Food/condiments.rsi/bottle-s-alpha-1.png | Bin 147 -> 0 bytes .../Food/condiments.rsi/bottle-s-alpha-2.png | Bin 240 -> 0 bytes .../Food/condiments.rsi/bottle-s-alpha-3.png | Bin 298 -> 0 bytes .../condiments.rsi/bottle-s-coldsauce.png | Bin 289 -> 0 bytes .../Food/condiments.rsi/bottle-s-empty.png | Bin 271 -> 0 bytes .../Food/condiments.rsi/bottle-s-hotsauce.png | Bin 295 -> 0 bytes .../Food/condiments.rsi/bottle-s-ketchup.png | Bin 307 -> 0 bytes .../Food/condiments.rsi/bottle-s-vinegar.png | Bin 289 -> 0 bytes .../Food/condiments.rsi/bottle-vinegar.png | Bin 0 -> 761 bytes .../Food/condiments.rsi/label-s-c.png | Bin 121 -> 0 bytes .../Food/condiments.rsi/label-s-h.png | Bin 125 -> 0 bytes .../Food/condiments.rsi/label-s-k.png | Bin 129 -> 0 bytes .../Food/condiments.rsi/label-s-v.png | Bin 108 -> 0 bytes .../Food/condiments.rsi/label-v.png | Bin 0 -> 510 bytes .../Consumable/Food/condiments.rsi/meta.json | 40 +-- Resources/migration.yml | 3 + 18 files changed, 67 insertions(+), 260 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-coldsauce.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png create mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-v.png create mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-v.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index aea084a0a1..ab6ac3295c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -10,7 +10,7 @@ FoodCondimentBottleHotsauce: 1 FoodCondimentBottleKetchup: 1 FoodCondimentBottleBBQ: 1 - FoodCondimentBottleSmallVinegar: 2 + FoodCondimentBottleVinegar: 2 ReagentContainerOliveoil: 2 MonkeyCubeBox: 1 FoodContainerEgg: 1 @@ -18,4 +18,4 @@ ReagentContainerMilkSoy: 1 FoodButter: 4 FoodCheese: 1 - FoodMeat: 6 \ No newline at end of file + FoodMeat: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 642a9006f7..04845e4446 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -1,10 +1,28 @@ # TODO: Removes the icon components from all these when that gets fixed. +- type: entity + parent: BaseItem + id: BaseFoodCondiment + abstract: true + components: + - type: DrawableSolution + solution: food + - type: DrainableSolution + solution: food + - type: Sprite + sprite: Objects/Consumable/Food/condiments.rsi + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + - type: TrashOnEmpty + solution: food + - type: SpaceGarbage + - type: StaticPrice + price: 0 + # Packets -# Since this one is closed, the only way to insert liquid is with a syringe. - type: entity - parent: BaseItem + parent: BaseFoodCondiment id: BaseFoodCondimentPacket name: condiment packet abstract: true @@ -15,15 +33,12 @@ refillable: false openSounds: collection: packetOpenSounds - - type: DrawableSolution - solution: food + # Since this one is closed, the only way to insert liquid is with a syringe. - type: InjectableSolution solution: food - - type: DrainableSolution - solution: food - # Note NOT refillable. - # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs. - # Well its fixed now, but I want to share my pain. + # Note NOT refillable. + # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs. + # Well its fixed now, but I want to share my pain. - type: SolutionContainerManager solutions: food: @@ -31,22 +46,12 @@ - type: SolutionTransfer maxTransferAmount: 10 - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi state: packet-empty - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: packet-empty - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentPacket - id: FoodCondimentPacket - components: - - type: Tag - tags: - - Trash + - type: PhysicalComposition + materialComposition: + Plastic: 50 - type: entity parent: BaseFoodCondimentPacket @@ -334,7 +339,7 @@ # Bottles - type: entity - parent: BaseItem + parent: BaseFoodCondiment id: BaseFoodCondimentBottle abstract: true name: condiment bottle @@ -344,10 +349,6 @@ solution: food openSounds: collection: pop - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - type: SolutionContainerManager solutions: food: @@ -357,23 +358,14 @@ minTransferAmount: 5 maxTransferAmount: 30 - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-empty - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: bottle-alpha- - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentBottle - id: FoodCondimentBottle - components: - - type: Tag - tags: - - Trash + - type: PhysicalComposition + materialComposition: + Glass: 50 - type: entity parent: BaseFoodCondimentBottle @@ -395,7 +387,6 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-coldsauce - type: entity @@ -418,13 +409,34 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-enzyme +- type: entity + parent: BaseFoodCondimentBottle + id: FoodCondimentBottleVinegar + name: vinegar bottle + description: Used in cooking to enhance flavor. + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Vinegar + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-v + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + state: bottle-vinegar + - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleHotsauce - name: hotsauce + name: hotsauce bottle description: You can almost TASTE the stomach ulcers now! components: - type: SolutionContainerManager @@ -441,13 +453,12 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-hotsauce - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleKetchup - name: ketchup + name: ketchup bottle description: You feel more American already. components: - type: SolutionContainerManager @@ -464,13 +475,12 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-ketchup - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleBBQ - name: BBQ sauce + name: BBQ sauce bottle description: Hand wipes not included. components: - type: SolutionContainerManager @@ -488,13 +498,12 @@ visible: true # So there's no error. - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-ketchup # Shakers - type: entity - parent: BaseItem + parent: BaseFoodCondimentBottle id: BaseFoodShaker abstract: true name: empty shaker @@ -503,10 +512,6 @@ - type: Drink solution: food isOpen: true - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - type: SolutionContainerManager solutions: food: @@ -534,22 +539,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-empty - - type: Appearance - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodShaker - id: FoodShakerEmpty - name: empty shaker - description: A shaker used to store and dispense spices. - components: - - type: Tag - tags: - - Trash - type: entity parent: BaseFoodShaker @@ -563,12 +553,9 @@ reagents: - ReagentId: TableSalt Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-salt - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-salt - type: entity @@ -583,160 +570,7 @@ reagents: - ReagentId: Blackpepper Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-pepper - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-pepper - -# Small Bottles - -- type: entity - parent: BaseItem - id: BaseFoodCondimentBottleSmall - abstract: true - name: condiment bottle - description: A smaller glass bottle used to store condiments. - components: - - type: Drink - solution: food - openSounds: - collection: pop - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - - type: SolutionTransfer - maxTransferAmount: 15 - - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-empty - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 3 - fillBaseName: bottle-s-alpha- - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmall - components: - - type: Tag - tags: - - Trash - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallColdsauce - name: coldsauce bottle - description: Leaves the tongue numb in its passage. - components: - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Frostoil - Quantity: 15 - - type: Sprite - layers: - - state: bottle-s-empty - - state: label-s-c - - state: bottle-s-alpha-3 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-coldsauce - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallHotsauce - name: hotsauce - description: You can almost TASTE the stomach ulcers now! - components: - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Hotsauce - Quantity: 15 - - type: Sprite - layers: - - state: bottle-s-empty - - state: label-s-h - - state: bottle-s-alpha-3 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-hotsauce - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallKetchup - name: ketchup - description: You feel more American already. - components: - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Ketchup - Quantity: 15 - - type: Sprite - layers: - - state: bottle-s-empty - - state: label-s-k - - state: bottle-s-alpha-3 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-ketchup - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallVinegar - name: vinegar - description: Used in cooking to enhance flavor. - components: - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Vinegar - Quantity: 15 - - type: Sprite - layers: - - state: bottle-s-empty - - state: label-s-v - - state: bottle-s-alpha-3 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-vinegar - -# Trash - -# Maybe in some dumb universe you could put liquid back in this and seal it -# with a lighter or something. -- type: entity - noSpawn: true - parent: BaseItem - id: FoodCondimentPacketTrash - name: empty condiment packet - description: A ripped condiment packet. Useless. - components: - - type: Sprite - sprite: Objects/Consumable/Food/condiments.rsi - netsync: false - state: packet-trash diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png deleted file mode 100644 index c92c93cdd45ec27bd2eb354b3d3cbd923b029285..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcif|7Y_0^7;v;c41cT_ zyYO~Nm*2spH3v*gO)u`Q`0(JrYK%w22Nt062idB{^*x5w@4Gs7KYwSm`S|Z`ISj8W v)_z@M{_ROl;rE^U_HDTql*weT{*vMMJK<}qt&;ZuwJ~_Q`njxgN@xNA^QAm+ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png deleted file mode 100644 index 7256ecf197bdef265dbe3734fc5182adfa8c01df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmVrl6xqOP2-;7{F6xitLm+Bar3>UN1BAD5YVxZ!%fDi&&Z^9D2 zxH{~5Jm0j(ob%sAedKsK(Xb{`RZ`mb*m4N43)5;ony^@J%RrfVB0UH1R;dIqAJvQ0)k6G zN;a5)G)-Og#u#^Rx-go6A)yLrt*;P*w9+I?A z`uFlYA57F&4(B73O8`U!gq^e2M}aiEBuQ-9>|UC;Z?och$AZQW!2A4DH5ISMvMJVTshvsfqzfIBZDDbWrFOca|iVjUn} zGUY!*ZxaK9tp?kAe{+d};W`@w!g|q+vKf|zZ-#)U;p{OJTSv(-XH`wn# z1A{Rfg8)Q~bU=1CL{D^^cj}Xs4arXfZW~d{0WtykX#iw-Kopb>B5sgn4B71g^z#2@ nPYxqF?SWA+3Pw0!U|;|MzsyU5r1F!A00000NkvXXu0mjfVxe!F diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png deleted file mode 100644 index 08ea20bab4f79764b197fb213383ffd5fa5e453e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJYo0ESArY;~60D08M0%PU*?OMb z`2YWZy@jw>^V!4{mAe*VMKTPVS1exqSgvE;iWLgSB@7ajqSdD!xKQfg?tVO$o12?0 zGc(g*_B*}>VhY;g2WtNR_?W!o#^vSyj-7!sLpHaiNm*3=njvJEbcA8kqJ;PN_WoD* zncbljHeu@d2XEf^Osh<>WRPt*a>6kCz-5NW1LimQm028;p3HC!i%rPQDm|}%B%U)i z=kqP!FNF*oBG1L{I_tBaU`$!gIN_<1l2U>Xr-JqE1=IgOnbHLE0uvh$Fq||`x*3}44$rjF6*2UngBV0Yj*$u diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png deleted file mode 100644 index d71d89ea129e93712f1a32d709b2b07a0c37169b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmV+?0oeYDP)h$AEtW3!A4I>J`3h`~c!oI1W-(C`0L6TaU`z?1$N|&1R-TQySw23HU1zGtF&d$!16$+#{V80H-e-MDtATe^xVxhz#tIlwpA z5AO38DF_V`BgZVVvmtt-Q{A5@29p001U>U3~#XbzcAg002ovPDHLkV1iC%aRdMW diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png deleted file mode 100644 index bf805dbb9b2bf1dc0cec4c62a6866d94bbaec47a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmV-30nGl1P)h$AEtW3!A4I>J`3h`~c!oI1W-(C`0CNNx!I%<2kprj!hOPrP zRfzvj`C!bT&kAAF)d6DZVnm7249pf_`2U~5`2Rgo1~5J)%J3f~Mz;{4CLqfJo1FcK z5+eqXm5KN6-TQySw23HU1zGtF&d$!16$+#{02KFNz+eofKw{*W#X^Zg?u#)pDE=oq z2a*qbgZ(f<03=3^fn>!QD9fQII={V}7*aowZXVfDuxag6hWnyt!R$8-3=9{^G>2>l zfGk&hZ4BW+9YPKuyFGwj{`+;jWF)6OFbYP&2nP%d3;;=dVBW27#tQ%d002ovPDHLk FV1jl{c}4&L diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png deleted file mode 100644 index 2775306d1642ea7292206a783ba205bce85c3c65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)h$AEtW3!A4I>J`3h`~c!oI1X0cEb00%Q6?$!>09ggm-o1PO zPnb3lMXVqzpTXJLnPl_Gj)GTDUNUT2vk^{{3kEz5kOh2${r-c1xw-j&7yyZpV-{Iy z;6Mh$fAmCGEV_xoVFu~ukzE;031Eho1FWB(k!uY3X#ixonyxt*gNkEv0om;V^pa20 n;3XqD?SWA+3Pw0!U|;|MUanQ<(q@|^00000NkvXXu0mjf!UA^N diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8398af3fb3c340fc065e6d900a248ce6e89a7c GIT binary patch literal 761 zcmVon6!fk{SG}EY zIC0^om*JRZ>azWX)T`?X9g zA$%PqV{Hi!z=TF7PQe+P7s;4*I#PKH9GDc2#OxTypmbAZl)R%aY`Q=5a zgR+M(i4Y=)mpCOh$WkOAH7}X9_Knwk^AyCR$y=w4A&xW|@%lwAN!O&*l;}x$vXoWs z|MN6clN0sso*+11EbC(gI`^Pjv8qXZ2f^ zt5*O3010qNS#tmY3labT3lag+-G2N400A*cL_t(o!((6=1*2eq0V6Sr{{R1vRa{b3 z=s(DW7q8zllIs8#N?fli&kv@74j|hMrh$$EvO~blMDf3^ffB>>x1Sgo85#fYJbe#m zGyvsk7XpkF>Sv!DgQ?f{%t4klGP*|1)~4}@OWoxo};$g00000NkvXXu0mjfisM=y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png deleted file mode 100644 index c1cf210a6803d95574d0d653c9103c66f638ca86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz2TvErkcif|7Y=eVDDXI6bh+d4 zeg1*DT3mV;tQyZ1vHDn)78&qol`;+0E&qz$N&HU diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png deleted file mode 100644 index 1173f56c002588be030c9ae716e7a480da17aa38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcie~3D(64B0Wuk23&3j zH6&P_#ok;`{K3y;Fe|2hLx2#&+DknNw;Gv@XJ`~Ud=1`YYX?!bn1M+`LV`iVm0vi% SS#dtlJO)o!KbLh*2~7Z(86nC5 diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png deleted file mode 100644 index f056783c033e9bc8b2668abb4122809e6d4638f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz4^J1zkcif|7dG-9P!M1_c(jPS z%#Zg%y=Ix8a6}W|4~|Opoi9q4yH8T_yj`XD%VFlm7d)^ZM3=H!^Lu;d|e=W9+PN=UBW_VES$#y45;)_wSrZbBsQ&(#*m~)aTQz~1P9T@ zufczytKh022#O%$=I+-b63?|li_{xV&cl1}dpP%82&XKg=rxQ((e~YRG7+E4&c~ac zX(URsL_{+@XJUFf#lP$0mXOLfgR0j5=jyJOrJQF#C@MT^IIb@&-H=-K9mSi%9Y#T0 z5clb(dIsu|DMuwKJP!7U2+3-=VQlJVP*x=Ac&&(28h zlIX@GO_Bt0bV@8^;WH@NmYLP}4gL70SP_pQe}^)zIPw(4J0NOFs^%n{qUYqZD66^u zou_Ax3|Feh643Y<1h2i&v<+WdLGXDP1YbuGd4O}f>R*vLjlGM$Rn>a-p=}*bFRGfp z17{o1dGBbh_9I0k!lnr?C(xRO_G@TfsLbkjpW{2otjQBy!R{XP$@#X$Z+$dp&7374 zHUIzs32;bRa{vGf5&!@T5&_cPe*6Fc05?fQK~z}7?bERd05AvyK*>_>KUqSGU%(~= z?kX#JQL6xeq3+&s>uI0$dJqA|visbEuK?g%2Lj+0hXWV8=Kufz07*qoM6N<$f|^0$ A>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json index 05b5ef2dc3..cd02b0bed0 100644 --- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e", + "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e. label-v.png made by deltanedas (github)", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "bottle-enzyme" }, + { + "name": "bottle-vinegar" + }, { "name": "bottle-coldsauce" }, @@ -40,30 +43,6 @@ { "name": "bottle-alpha-6" }, - { - "name": "bottle-s-ketchup" - }, - { - "name": "bottle-s-hotsauce" - }, - { - "name": "bottle-s-empty" - }, - { - "name": "bottle-s-coldsauce" - }, - { - "name": "bottle-s-vinegar" - }, - { - "name": "bottle-s-alpha-1" - }, - { - "name": "bottle-s-alpha-2" - }, - { - "name": "bottle-s-alpha-3" - }, { "name": "label-b" }, @@ -80,16 +59,7 @@ "name": "label-k" }, { - "name": "label-s-c" - }, - { - "name": "label-s-h" - }, - { - "name": "label-s-k" - }, - { - "name": "label-s-v" + "name": "label-v" }, { "name": "packet-astrotame" diff --git a/Resources/migration.yml b/Resources/migration.yml index 0d8b17df16..a7f004fbea 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -47,3 +47,6 @@ WeaponSubMachineGunVectorRubber: WeaponSubMachineGunDrozdRubber MagazineBoxAntiMaterial: MagazineBoxAntiMateriel CartridgeAntiMaterial: CartridgeAntiMateriel BulletAntiMaterial: BulletAntiMateriel + +# 2023--05-10 +FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce -- 2.51.2