From be0115b8d6c77d7e73cfd49982e038ef5acbc677 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Sat, 11 May 2024 11:54:59 -0700 Subject: [PATCH] Undo warp-strings (#103) ## Mirror of PR #1013: [Undo warp-strings](https://github.com/DeltaV-Station/Delta-v/pull/1013) from DeltaV-Station [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) ###### `f3048043658cde7a69c831b3c5342d516ed55449` PR opened by IamVelcroboy at 2024-03-27 16:28:25 UTC PR merged by web-flow at 2024-03-27 16:40:16 UTC --- PR changed 2 files with 34 additions and 34 deletions. The PR had the following labels: - Changes: YML - Changes: Localization ---

Original Body

> ## About the PR > Moves warp point location out of local strings > > ## Why / Balance > Code not properly set up to read it. I will leave the local file in so, in the future we can adjust to use it. But I am too busy and will not have time to do that any time soon. But this change is holding up map merges. So, this is the next best.
--------- Co-authored-by: Fluffiest Floofers Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: VMSolidus --- .../en-US/deltav/warp-points/warp-points.ftl | 2 +- .../{warp_points.yml => warp_point.yml} | 66 ++++----- .../Consumable/Drinks/drinks-cartons.yml | 123 ++++++++++++++++ .../Consumable/Food/Containers/lunchbox.yml | 135 +++++++++++++++--- .../Drinks/juiceboxapple.rsi/icon.png | Bin 0 -> 1575 bytes .../Drinks/juiceboxapple.rsi/icon_open.png | Bin 0 -> 346 bytes .../Drinks/juiceboxapple.rsi/meta.json | 17 +++ .../Drinks/juiceboxchocolate.rsi/icon.png | Bin 0 -> 1584 bytes .../juiceboxchocolate.rsi/icon_open.png | Bin 0 -> 1693 bytes .../Drinks/juiceboxchocolate.rsi/meta.json | 17 +++ .../Drinks/juiceboxgrape.rsi/icon.png | Bin 0 -> 1553 bytes .../Drinks/juiceboxgrape.rsi/icon_open.png | Bin 0 -> 323 bytes .../Drinks/juiceboxgrape.rsi/meta.json | 17 +++ .../Drinks/juiceboxorange.rsi/icon.png | Bin 0 -> 1588 bytes .../Drinks/juiceboxorange.rsi/icon_open.png | Bin 0 -> 364 bytes .../Drinks/juiceboxorange.rsi/meta.json | 17 +++ .../Drinks/juiceboxpineapple.rsi/icon.png | Bin 0 -> 1561 bytes .../juiceboxpineapple.rsi/icon_open.png | Bin 0 -> 365 bytes .../Drinks/juiceboxpineapple.rsi/meta.json | 17 +++ 19 files changed, 359 insertions(+), 52 deletions(-) rename Resources/Prototypes/DeltaV/Entities/Markers/{warp_points.yml => warp_point.yml} (77%) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl index 36c7db9a346..0079685cb06 100644 --- a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl +++ b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl @@ -1,4 +1,4 @@ -warp-point-evac = Evac +warp-point-evacshuttle = Evac Shuttle warp-point-shuttle = Shuttle warp-point-debris = Space Debris warp-point-ruin = Space Ruin diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml similarity index 77% rename from Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml rename to Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml index 90c18670f0f..e2fec5fa00d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml @@ -5,7 +5,7 @@ suffix: Evac Shuttle components: - type: WarpPoint - location: warp-point-evac + location: Evac Shuttle - type: entity id: WarpPointShuttle @@ -13,7 +13,7 @@ suffix: Shuttle components: - type: WarpPoint - location: warp-point-shuttle + location: Shuttle - type: entity id: WarpPointDebris @@ -21,7 +21,7 @@ suffix: Space Debris components: - type: WarpPoint - location: warp-point-debris + location: Space Debris - type: entity id: WarpPointRuin @@ -29,7 +29,7 @@ suffix: Space Ruin components: - type: WarpPoint - location: warp-point-ruin + location: Space Ruin # Command - type: entity @@ -38,7 +38,7 @@ suffix: Bridge components: - type: WarpPoint - location: warp-point-bridge + location: Bridge - type: entity id: WarpPointVault @@ -46,7 +46,7 @@ suffix: Vault components: - type: WarpPoint - location: warp-point-vault + location: Vault # Security - type: entity @@ -55,7 +55,7 @@ suffix: Security components: - type: WarpPoint - location: warp-point-sec + location: Security - type: entity id: WarpPointPerma @@ -63,7 +63,7 @@ suffix: Perma components: - type: WarpPoint - location: warp-point-perma + location: Perma - type: entity id: WarpPointDetective @@ -71,7 +71,7 @@ suffix: Detective components: - type: WarpPoint - location: warp-point-detective + location: Detective - type: entity id: WarpPointCourt @@ -79,7 +79,7 @@ suffix: Courtroom components: - type: WarpPoint - location: warp-point-court + location: Courtroom #Medical - type: entity @@ -88,7 +88,7 @@ suffix: Medical components: - type: WarpPoint - location: warp-point-medical + location: Medical - type: entity id: WarpPointMorgue @@ -96,7 +96,7 @@ suffix: Morgue components: - type: WarpPoint - location: warp-point-morgue + location: Morgue #Epistemics - type: entity @@ -105,7 +105,7 @@ suffix: Epistemics components: - type: WarpPoint - location: warp-point-epistemics + location: Epistemics #Logistics - type: entity @@ -114,7 +114,7 @@ suffix: Logistics components: - type: WarpPoint - location: warp-point-logistics + location: Logistics - type: entity id: WarpPointSalvage @@ -122,7 +122,7 @@ suffix: Salvage components: - type: WarpPoint - location: warp-point-salvage + location: Salvage #Engineering - type: entity @@ -131,7 +131,7 @@ suffix: Engineering components: - type: WarpPoint - location: warp-point-engineering + location: Engineering - type: entity id: WarpPointSingulo @@ -139,7 +139,7 @@ suffix: Singularity components: - type: WarpPoint - location: warp-point-singularity + location: Singularity - type: entity id: WarpPointAtmos @@ -147,7 +147,7 @@ suffix: Atmos components: - type: WarpPoint - location: warp-point-atmospherics + location: Atmos #Service - type: entity @@ -156,7 +156,7 @@ suffix: HoP components: - type: WarpPoint - location: warp-point-hop + location: HoP - type: entity id: WarpPointKitchen @@ -164,7 +164,7 @@ suffix: Kitchen components: - type: WarpPoint - location: warp-point-kitchen + location: Kitchen - type: entity id: WarpPointBar @@ -172,7 +172,7 @@ suffix: Bar components: - type: WarpPoint - location: warp-point-bar + location: Bar - type: entity id: WarpPointBotany @@ -180,7 +180,7 @@ suffix: Botany components: - type: WarpPoint - location: warp-point-botany + location: Botany - type: entity id: WarpPointJanitor @@ -188,7 +188,7 @@ suffix: Janitor components: - type: WarpPoint - location: warp-point-janitor + location: Janitor - type: entity id: WarpPointReporter @@ -196,7 +196,7 @@ suffix: Reporter components: - type: WarpPoint - location: warp-point-reporter + location: Reporter - type: entity id: WarpPointLawyer @@ -204,7 +204,7 @@ suffix: Lawyer components: - type: WarpPoint - location: warp-point-lawyer + location: Lawyer #Misc - type: entity @@ -213,7 +213,7 @@ suffix: AI components: - type: WarpPoint - location: warp-point-ai + location: AI - type: entity id: WarpPointArrivals @@ -221,7 +221,7 @@ suffix: Arrivals components: - type: WarpPoint - location: warp-point-arrivals + location: Arrivals - type: entity id: WarpPointEvac @@ -229,7 +229,7 @@ suffix: Evac components: - type: WarpPoint - location: warp-point-evac + location: Evac - type: entity id: WarpPointCryo @@ -237,7 +237,7 @@ suffix: Cryo components: - type: WarpPoint - location: warp-point-cryo + location: Cryo - type: entity id: WarpPointChapel @@ -245,7 +245,7 @@ suffix: Chapel components: - type: WarpPoint - location: warp-point-chapel + location: Chapel - type: entity id: WarpPointLibrary @@ -253,7 +253,7 @@ suffix: Library components: - type: WarpPoint - location: warp-point-library + location: Library - type: entity id: WarpPointDorms @@ -261,7 +261,7 @@ suffix: Dorms components: - type: WarpPoint - location: warp-point-dorms + location: Dorms - type: entity id: WarpPointDisposals @@ -269,4 +269,4 @@ suffix: Disposals components: - type: WarpPoint - location: warp-point-disposals + location: Disposals diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml new file mode 100644 index 00000000000..1d0eb4e8506 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -0,0 +1,123 @@ +- type: entity + parent: DrinkBase + id: DrinkJuiceBoxBaseFull + abstract: true + components: + - type: Openable + sound: + collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯ + - type: Sealable + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + - type: Item + size: Small + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior { } + - !type:DoActsBehavior + acts: [ "Destruction" ] + #In future maybe add generic plastic scrap trash/debris + - type: TrashOnSolutionEmpty + solution: drink + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceOrangeJuicebox + name: orange juice box + description: A great source of vitamins. Stay healthy! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceOrange + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuicePineappleJuicebox + name: pineapple juice box + description: Everyone's favourite juice. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuicePineapple + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceAppleJuicebox + name: apple juice box + description: Sweet apple juice. Don't be late for school! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceApple + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceGrapeJuicebox + name: grape juice box + description: Tasty grape juice in a fun little container. Non-alcoholic! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceGrape + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkChocolateJuicebox + name: chocolate milk juice box + description: Tasty chocolate juice and milk in a small box. Contains Theobromine. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: HotCocoa + Quantity: 10 + - ReagentId: Milk # The milk of chocolate milk + Quantity: 10 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml index 99c5d49c1b2..46e689615b3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml @@ -11,7 +11,7 @@ - state: generic-open map: ["openLayer"] - type: Item - size: Normal + size: Large shape: null sprite: DeltaV/Objects/Storage/lunchbox.rsi heldPrefix: generic @@ -20,7 +20,7 @@ grid: - 0,0,1,1 - 3,0,1,1 - - 4,0,4,2 + - 4,0,4,1 - type: PhysicalComposition materialComposition: Plastic: 100 @@ -42,28 +42,74 @@ components: - type: StorageFill contents: + #Main - id: FoodPizzaArnoldSlice orGroup: HealthyOrUnhealthyMain - prob: 0.5 + prob: 0.2 amount: 2 - - id: FoodApple + - id: FoodBurgerCheese orGroup: HealthyOrUnhealthyMain - prob: 0.5 - - id: DrinkWaterBottleFull + prob: 0.2 + - id: FoodCarrot + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + - id: FoodMothCapreseSalad + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + - id: FoodEggBoiled + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + #Drink + - id: DrinkJuiceOrangeJuicebox orGroup: HealthyOrUnhealthyDrink - prob: 0.5 - - id: DrinkCartonOrange + prob: 0.15 + - id: DrinkJuicePineappleJuicebox orGroup: HealthyOrUnhealthyDrink - prob: 0.5 + prob: 0.15 + - id: DrinkJuiceAppleJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkJuiceGrapeJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkChocolateJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkWaterBottleFull + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + #Snack - id: FoodSnackCheesie orGroup: HealthyOrUnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackBoritos + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodSnackChips + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodSnackPistachios + orGroup: HealthyOrUnhealthySnack + prob: 0.15 - id: FoodSnackChocolate orGroup: HealthyOrUnhealthySnack - prob: 0.25 - - id: FoodCarrot + prob: 0.15 + - id: FoodSnackSus orGroup: HealthyOrUnhealthySnack - prob: 0.5 + prob: 0.15 + - id: FoodMothMoffin + orGroup: HealthyOrUnhealthySnack + prob: 0.05 + - id: FoodMothMothmallowSlice + orGroup: HealthyOrUnhealthySnack + prob: 0.05 + - id: FoodApple + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodBanana + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + #Note - id: PaperWrittenNoteFromMumGeneric prob: 0.1 @@ -76,9 +122,26 @@ components: - type: StorageFill contents: - - id: FoodApple - - id: DrinkWaterBottleFull + #Main - id: FoodCarrot + orGroup: HealthyMain + prob: 0.5 + - id: FoodMothCapreseSalad + orGroup: HealthyMain + prob: 0.5 + - id: FoodEggBoiled + orGroup: HealthyMain + prob: 0.25 + #Drink + - id: DrinkWaterBottleFull + #Snack + - id: FoodApple + orGroup: HealthySnack + prob: 0.5 + - id: FoodBanana + orGroup: HealthySnack + prob: 0.5 + #Note - id: PaperWrittenNoteFromMumHealthy prob: 0.1 @@ -91,15 +154,51 @@ components: - type: StorageFill contents: + #Main - id: FoodPizzaArnoldSlice amount: 2 - - id: DrinkCartonOrange + #Drink + - id: DrinkJuiceOrangeJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuicePineappleJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuiceAppleJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuiceGrapeJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkChocolateJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + #Snack - id: FoodSnackCheesie orGroup: UnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackBoritos + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodSnackChips + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodSnackPistachios + orGroup: UnhealthySnack + prob: 0.15 - id: FoodSnackChocolate orGroup: UnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackSus + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodMothMoffin + orGroup: UnhealthySnack + prob: 0.05 + - id: FoodMothMothmallowSlice + orGroup: UnhealthySnack + prob: 0.05 + #Note - id: PaperWrittenNoteFromMumUnhealthy prob: 0.1 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e8fd6f9878623cb9ac275936aeca328554194708 GIT binary patch literal 1575 zcmbVMTWB0r7(NZDq=6(BED=lObOKt5bKmUl96HTqH|;JsY1piE3nHDJIlDXV&YbDY zY<9B`DuJd{L=3186(5A6D7N}i#Wu8fEA*|j)PhqQwrJIk)e8 z|NTEaH@kbF|B-$Gz(6{c%+MKzqwfLw_Zy8HblT*m_W1w|ei@Dpua6CG1)%q;mCXe? z?I~mso6}8_$6VcZDH?zs6LnWN$~b^|T(lgOxpwLd11(c!_Ks_U<|c5-N;Nz@-xLWrOW@X&t}qC+ac2 zuDiU*3876*plNh*Zq=(ag_{PCE7-jCkygj70_n(L?xC7F}q_Pv&4 zlA8a-9S?9)53tJ6s6|*oW+gc*i6|07a&$}(ks!378ZoWH;(E|=0ZFmDpfqPpJ<#t7 zHVsrDo~=`ZEn6>Q-gSx$?79&pNQHP*Fx5_OYN2T;?f8N27&x6&8EP|USte5Ak{rh| zg%wRP#^%LHoQ)e%g^lKwm}o>IaZ!qQ-Y1Ds4I|rmZ~o8sdpwJlmR`AUp0MD;lt3xV zr@>lmSHwI%&|Xz6*vtZ?8)0^<@vAo`*d+aP z8)E4!7sldsa9}OEbZYSFN4e_xx2NIkNKYnpczOEv z+M(6oRwk}(e&@vUo`KbcA+Q00UI4zkIl1!D*OxwhzI1aQfZXZFw*T?%FGpW;AHH&| z{42k-D>HK&oP6fQJa{jk+OqZ8bLH1oKR$lxOzc&A;lb(2KK=KX`w~nU6mE^8V`tG@ zIQ6do#fQ#t_Og8a&x_9u-Qbsg%-^Ofof|`CUL3l>CLcetW%3(9zx2#(^7!=rrN04ML;XYm literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..06a5ba1f4e399c1b0c74606b529c3fdd59b1905a GIT binary patch literal 346 zcmV-g0j2(lP)slfbSVmEivHtM?54ANO$Xm7!w^00AHXxBz_LPopRT z!!W?MZK+j&Jlt^{$@9FFt}!5f0${`GI)?xRRRWa5H!2jt>~~Rn0N1Wm0Sj)Ob!suG|aj;-2bXwH}9sdNKSXRA>GtfZfr)m4r&w*r7EZh-N2pPhu% ztRylmJz{X(W&tLr6=>!dwBhKZuHG)7hXL>J{;&n-+3sr#=z&EIhlX1atX+7K2}rx1 sf;wSn09fI*0C;aZbO3A#00AHX-X6VTa(By|S^xk507*qoM6N<$f^B4r+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d115d69833703a25b0f65551175d8ad35afc310b GIT binary patch literal 1584 zcmbVMU1%Id9N#1wYiWYM$QeIaH!n)N-w0FggAwBH*VC~+_+})Dfo$c=4 zM-Ie9X)zT=X^TGiQ4~rQ6@-dt3ymZwVoUoFeG;@Nv`-c>YSChxy^p1pXt4vcGqdxX z|NsB{e=ST+ZXehD+}Kujv;n998wV!auq%!a8Y!+N7tnq9TjbalB$!EYnMn{}}`jeSz}AfBjEGlxSqE=YUW42YK_q|%MlRM%uyQ3aK~ zf0yMTQuiOY>H*fx0H-(_wKy-SyrSk58N`zyu5FfNAW3bgL6B9PT@N~<09m>QN^=I8 zfq7jpf}lt|+oXgo+bm(xbxIr?xe=sEg?LmkwN7nWVHhCm_<`v_oYhkt7p4Tr zSUwHbY^Nf2;=P?+#bR4o08AKWcZ!2ySTW){zpWegKwE6RjH%H72zMLilVVUeJv?5b z-nwo&iPU&8tiv`B@t+i1cURSH7fu^NxQ$v6Jw#0mJG66ov_&;e#Gj0ecNh7&z(M2c{pT;7ebfEwUDf?QLc2c605pV~pwsWV-9!d+o8_$L?-x z*J-w(fWm?iXAHy-OjeW-2^b+W6BltI{(&E0h-l0tfI1TyiLk_|QQzy@2F#SmC3pAU z-Sa-b-}C#r=i6GFixxky7(tMtfS+xLchov>yA@uIWb!J!-LCo98wgT7Wu191R~0{q zAO*8hsMG8WKFaW_Y~utq3~UKmgJ=Y)txISe-vdlE3?h=^#V$`wVyGl|u?}aD3~G%a zD*2N-SeI-K@yQYcZt9_;y zgRahNkhL7GVr1e3BSs`Rji79#r6~;*_#95_(_?Al0#AS#kbzZBRceH|3mjKG=P4Z#A>h^j7gP_QI(5kP241VeLSWE$0&szbxjJA2xTV2}wY zhRG>B2(VrZYPLy|zz7ar5W~EPyG4%2T^@&kb9NBMU9=mxMYl*h9pUVLR^|Jw%x3os z|8xHuU4pH}#crC%YB;MT7{6q|WDR6GVjbwstYQ+Ht^$VRt?Kq-yp>iUV42s_O-Ep! zHXa3#^gq%)4>MHJjB`5hMPRgUSWX0Vp0N6GUI+0{iRo|G^lTOm2Z6QBjUf1t8)86# zlS_vqDs@*ijUaiC1z2CGbIYaC!>d28FFi5&<$VP|?Ml@)cQHc$%oq6SVx_C#qcgsx zODCQi+Wg!7?(x2R#&*4P4t1B$oV)mo*85^ZFuxO2llj{n3>zgz1p!muXxR8 zJ~lD*^wu8-xIceBpLF8TsZC$w<3mra58fdfb(aqe6|T@r$~LwgU0K08>n*{z)V6;x U8NXW`vwk3frdIY~L-*#t0pNu|asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json new file mode 100644 index 00000000000..719567215e0 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e and modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a47b141691f17ef1837243b16abf56d2b0b7c95 GIT binary patch literal 1553 zcmbVMTWB0r7(OZ8G^uu5i$!dqo=!nxlezD1GRJPyn2ly@H!j=7toYKCGiP^)?93Tw zX1kY{7Nr%Th~ll@AXM;4`%o>2trkIwRcpYa76mV$4=q|1Di##+%-(1vTI|5goSE~T z@BhF5_E>i2o>eQ?uLJ8V9{0+l*=MuO%&n%)`>h6v){*@HULEs`;uGMN% zO_!Kgl2yYnWJQxTP2>pCZ#V(2i;lm!%aEcz@hms6m;*ybJjbd*QsAz(HP~*C*6}-W z;t`YU*p*dD2{pBVCh6has#j?lH;GIu)TU10bFA9Kx@8tHzs&xHy0?9m0Up~-re|YG zUu?T)!VjkQa2cI|EQ$8>4VTI}>a(gx=+qwW=H^h1izYpa1Lox!t8_D!?Yay#UDDyu ztmT-j=HGF}0h+=AO$t0~F;US)P0wp8iY1U9A68VPC~atlnO3o}6f~|O?P@5m850Ni znqZTlBJ*s_1zR>QQQ37$0_=qmO|lB}xMA*{-tr=oL21ViutR7%l@z#U$+AqIdnFN% z83~aXMCXqf7RQPSL&T$oK8H0WUM!Aw&!-rvhMDc2H~;7P`#g)c7Oq@3PuOr_NuX)V z=gDexI${@nsI#hAuvG;Jld!sz0twSfO`-GKy6y&zx9reJOJK(INW7(Z27uM8UzoBFndfy{mueI|jF} Vd$V}U7hDubPtBx`+_n4RzX5k9`85Cl literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..55b8790640440c741d9e43930c22235e1bba0716 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQUW z#WAE}&fBSmd`$)-ZStMb?&1ch>=Gt=MvK>b zdL|0owh5SAcal4I`v2_N?(QE_dm01{n7o)Gr-fF|Ykq9;VAnd+6%8ExO$WLj?>J=H zdc>Wn$l_cpi@*iV3w->4Q)PAfSpzo(Sxxn0w2XP+Yx{5O@v^;bkH5@l(wfWkwjgWE z?GIb*%>5Dq80Ril6Fo3@dwKjFuDE87fJHhF+KvCIADMJ8?_kx|#QjXaPxIYqX578$ zSXHHd<;qX>;Rf?{?!_Hs+xC}B<>Ev0T@LC!J`Gwi-VR^4DvK{T#v#F|{DI}0dA53n TQ~X|F05EvE`njxgN@xNAd%k5(0?^LW04QXmE3fh|DnZ40UO0ffH&h0zj zfBz4~h9BS9w55q4h>g*~$S9ske>7~sf45Nh15b_i;FwDgEg$%!?(p`O`w8N%3r0NQ zCDffVKqjN0@#sntxG%{yqELYAcREbx{YyX&~$P&bxRH$BGAem5OWFK-M8D@AI za2!X5B}M`O1a-KB6gWX(Ig#aqG|$UIr_4)a<)g4TM^DP5k%5XZyi=&O=h-sLX0ur) zD>BGQvAiTnEGMvnKw|{$<}FXl(U!Zd$`FAra17fskVX28+60>N6bh?aw!yS(w3b`( z6ZROJ(`=S!INzocPzN=fJ>_Id!gavH3^bwTxfsjWuyz`G$W5bLP}i<+5`cZHsx=ww z>SCHT5w6$2ADdBe$hv4Zp0^=83SBhi0NB4DtGUg$#+LgWsCmeVBb2E|DppmQ6huZO zJN6isjjDsHs0$ElAJpiHP!iHGq(kZ9ASa1psQNyFz?2`>>U;fvz8`T6TvuA=j(PlQ^YcL- zG+Z31e5D+A!>22&j6s%CK-Pet+6o2ym_nVZ92hgzpOPMys5P>XyKma;O2CF>8%Ca*seq)z464s z)gye<*+*OZpZe;fv+X|}Q>W+V>rY*7=p4^C^6%vWU0s`;hNT}GPak{X%_m!T%(it7 zwC+0k;FiF(&z@bocJ#ZyXJ2V+%%7ZDS-rOyND$3L{CNH8weP>VkfE8ykvihl)t29v zFORw_TNnNuy7_r>_q z=BtOgVy`_n^RY|((@}gWKzw>$`r7E27taNLrki)RZ8-B{;m573J$E1Z{HiJZdUF20 z;>!ny-d-EOVm4pj{NeJ!u}>O``njHH_w?-HXIjUI=6!XSa_s}(zH{-?mwsQ5_76wi Icx>PFzjjU--~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..fefe447542c66739cf7a6b71741347530b19a998 GIT binary patch literal 364 zcmV-y0h9iTP)VQ!Pj5>fM2VA*w<^S{N&lw~oB^h*dbQtOC z0GQ>juC9!`ckliW;#0#BL^%N2au6Tp2nH$uf(}5p{8BUz*y5K+Y-FIf^b1L$LeK%o zmcxLGxii=SLNZElF(GM1hC3(sGLQ-gIsn~rY6G&fq4o7C3=BYD4~PTE32Lf302KE^ zXuf~<^ghG8C->;%0BQn~9dN;Y8n`3`VPpWxEg;OWG>*0o;Otn*z|76dz%ajtL1|w# zSnQrtD+6=YTn5gspGh^2vM2z>JEeeR2YjyxXZQ;Z{tvOs;NpMVk{P~(q9AT7Z5?2+ zGYe}j5CDdTI6ZR#HG-dP2auEBspbGuYdfktfZAZx0izBWbpQa?h+s+y3a`;^BAW8!(eos-qZge!)*T9 z%;x-@_Bceu;&p@MF<-MBie{L7$(p018SH~RE}C|N{pEvmEHI4(do-qrnlp+^X1ea; z!}Wev&yyyYYDc=3+XyI7Ff`P_%jK1BoGL4+9VhyE(UR4 z;*cncAg=N%LP#<2ULcFIEQnD-QaDM1@(`3%(EeB|&NT{fDmC5~Mt2Fe}i-M%8svydOEOQjWdGoff*Eri7>@cLThg{R~O=5$9QO}c#pJ1t~EgLK+q_w@a zpQy)#n(hb^F9tR>fd&e3PQ@)Zg&Rn~Wo%*F_b65hu}+Ej#4C}1p$@O_5I}vaX`ze_ zb+N2agy)aVQ8U^O*%0kz=N&9eVUJW?gvaKnnuCEg4jgr{?h`jlNVyZK$&SiEj`C5k z>!@iPr0VUy?Ey~dK2ESSY6>StIXRk@C8!KTF}g>TpeVMW8Zpem{6^523}dl7pfqO; z-Pi95HV`Zj*V3uMrll9L;MheLgl>eRq)c2Ym}(boYN2T`V|%`CBb-SkSZXtGng)y) z;%cFwid?iXByuRPNZhcPH@G2L5fv$(S9C+^yiXBS2_oBhZ~V{q2VIkvmR`PRo}l1@ zlz?f|qrsYQSHxjF+g_DT(98m;qaeEzEDFMk4Yqx3-m?cS|+nhPJm)GO3Yl z?s@cQqmexS$fmct-h1kD*K&WPvbxe8i9~YgPjAfj46eUcCNgAoteYOUcUdua|jdV+uBz@fggivtULdlyfBIoq|gyzu$-s<*b%J-$P{ a&M?otJ9+xh=IWN9d1uBZQtv!E{p{b@w*)Z& literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..db97ee7d3dd44cc5603257917cb3784fc33d248e GIT binary patch literal 365 zcmV-z0h0cSP)Ns_=cP1v@rwF=x)0t?9=p()kv$sRWdpQ>XSCPL6K61JrqHQUIGho4J_p4+GgMZU;aa zX~2sIIA<~Xv)e*Fdw#;}q6NVH-8l{~hd4D>h5B-Ig-x&q9^ab?9>7y00000 LNkvXXu0mjft^1hG literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +}