Upstream Merge 6/7/2024

[VMSolidus]

Don't read this please, there's meant to be a surprise here for the players. <3

[github-actions[bot]]

RSI Diff Bot; head commit 1b8d14940d22d0bfa9a030745f6f0a3c5db355d0 merging into 8e423f1ff26cdff9aec5b6b16d3b65b3e48aa773 This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi

| State | Old | New | Status | --- | --- | --- | --- | | peacock_tail_eyes | ![]() |  | Added | peacock_tail_feathers | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi

| State | Old | New | Status | --- | --- | --- | --- | | (mdr)grapejuice | ![]() | grapejuice.png) | Added | absinthebottle | ![]() |  | Added | alco-blue | ![]() |  | Added | alco-green | ![]() |  | Added | alco-red | ![]() |  | Added | alcoholfreebeer | ![]() |  | Added | alebottle | ![]() |  | Added | alecan | ![]() |  | Added | art_bru | ![]() |  | Added | badminka | ![]() |  | Added | baijiu | ![]() |  | Added | barflask | ![]() |  | Added | beastenergy | ![]() |  | Added | beer | ![]() |  | Added | beercan | ![]() |  | Added | bigteacup | ![]() |  | Added | bigteacup100 | ![]() |  | Added | blackstrap | ![]() |  | Added | bottleofnothing | ![]() |  | Added | broken | ![]() |  | Added | broken_bottle | ![]() |  | Added | bronze_cup | ![]() |  | Added | cachaca | ![]() |  | Added | ccola | ![]() |  | Added | champagne | ![]() |  | Added | coffee | ![]() |  | Added | cognacbottle | ![]() |  | Added | cola-blue | ![]() |  | Added | cola-brown | ![]() |  | Added | cola-green | ![]() |  | Added | cola-orange | ![]() |  | Added | cola-pink | ![]() |  | Added | cola-pork | ![]() |  | Added | cola-purple | ![]() |  | Added | cola-red | ![]() |  | Added | cola-yellow | ![]() |  | Added | cola | ![]() |  | Added | colabottle | ![]() |  | Added | coolant | ![]() |  | Added | cream | ![]() |  | Added | detflask | ![]() |  | Added | dnb | ![]() |  | Added | dr_gibb | ![]() |  | Added | energy_drink | ![]() |  | Added | fitness-cup_black | ![]() |  | Added | fitness-cup_blue | ![]() |  | Added | fitness-cup_red | ![]() |  | Added | flask | ![]() |  | Added | flavorpak | ![]() |  | Added | ginbottle | ![]() |  | Added | gingerbeer | ![]() |  | Added | golden_cup | ![]() |  | Added | goldschlagerbottle | ![]() |  | Added | grenadinebottle | ![]() |  | Added | hellshenbeer | ![]() |  | Added | herbal | ![]() |  | Added | holyflask | ![]() |  | Added | hrukhzaextract | ![]() |  | Added | ice_tea_can | ![]() |  | Added | ionbru | ![]() |  | Added | jar | ![]() |  | Added | jar_metroid | ![]() |  | Added | jar_what | ![]() |  | Added | kahluabottle | ![]() |  | Added | lager | ![]() |  | Added | lemon-lime | ![]() |  | Added | lemonjuice | ![]() |  | Added | limejuice | ![]() |  | Added | lithiumflask | ![]() |  | Added | lunabrandy | ![]() |  | Added | maplesyrup | ![]() |  | Added | milk | ![]() |  | Added | nothing | ![]() |  | Added | ocola | ![]() |  | Added | oil | ![]() |  | Added | orangejuice | ![]() |  | Added | patronbottle | ![]() |  | Added | pitcher | ![]() |  | Added | pitcher100 | ![]() |  | Added | pitcher15 | ![]() |  | Added | pitcher30 | ![]() |  | Added | pitcher50 | ![]() |  | Added | pitcher70 | ![]() |  | Added | pitcher85 | ![]() |  | Added | placeholder | ![]() |  | Added | premiumvodka | ![]() |  | Added | premiumwine | ![]() |  | Added | prosecco | ![]() |  | Added | purple_can | ![]() |  | Added | pwinebottle | ![]() |  | Added | rag | ![]() |  | Added | rag_lit | ![]() |  | Added | rag_small | ![]() |  | Added | rag_small_lit | ![]() |  | Added | rakia | ![]() |  | Added | ramen | ![]() |  | Added | rumbottle | ![]() |  | Added | sake | ![]() |  | Added | shaker | ![]() |  | Added | shinyflask | ![]() |  | Added | silver_cup | ![]() |  | Added | sodawater | ![]() |  | Added | soju | ![]() |  | Added | soymilk | ![]() |  | Added | space-up | ![]() |  | Added | space-up_bottle | ![]() |  | Added | space_mountain_wind | ![]() |  | Added | space_mountain_wind_bottle | ![]() |  | Added | starkist | ![]() |  | Added | syndi_cola | ![]() |  | Added | syndi_cola_x | ![]() |  | Added | tadmorwine | ![]() |  | Added | teapot | ![]() |  | Added | tequillabottle | ![]() |  | Added | thirteen_loko | ![]() |  | Added | thoom | ![]() |  | Added | tomatojuice | ![]() |  | Added | tonic | ![]() |  | Added | vacuumflask | ![]() |  | Added | vcola | ![]() |  | Added | vermouthbottle | ![]() |  | Added | vodkabottle | ![]() |  | Added | water | ![]() |  | Added | water_cup | ![]() |  | Added | water_cup_e | ![]() |  | Added | waterbottle | ![]() |  | Added | whiskeybottle | ![]() |  | Added | whiskeybottle2 | ![]() |  | Added | whiskeybottle3 | ![]() |  | Added | winebottle | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![]() |  | Added | icon_open | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![]() |  | Added | icon_open | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi

| State | Old | New | Status | --- | --- | --- | --- | | fitness-cup10 | ![]() |  | Added | fitness-cup100 | ![]() |  | Added | fitness-cup20 | ![]() |  | Added | fitness-cup30 | ![]() |  | Added | fitness-cup40 | ![]() |  | Added | fitness-cup50 | ![]() |  | Added | fitness-cup60 | ![]() |  | Added | fitness-cup70 | ![]() |  | Added | fitness-cup80 | ![]() |  | Added | fitness-cup90 | ![]() |  | Added | icon | ![]() |  | Added | icon_empty | ![]() |  | Added | icon_open | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi

| State | Old | New | Status | --- | --- | --- | --- | | fitness-cup10 | ![]() |  | Added | fitness-cup100 | ![]() |  | Added | fitness-cup20 | ![]() |  | Added | fitness-cup30 | ![]() |  | Added | fitness-cup40 | ![]() |  | Added | fitness-cup50 | ![]() |  | Added | fitness-cup60 | ![]() |  | Added | fitness-cup70 | ![]() |  | Added | fitness-cup80 | ![]() |  | Added | fitness-cup90 | ![]() |  | Added | icon | ![]() |  | Added | icon_empty | ![]() |  | Added | icon_open | ![]() |  | Added

Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi

| State | Old | New | Status | --- | --- | --- | --- | | fitness-cup10 | ![]() |  | Added | fitness-cup100 | ![]() |  | Added | fitness-cup20 | ![]() |  | Added | fitness-cup30 | ![]() |  | Added | fitness-cup40 | ![]() |  | Added | fitness-cup50 | ![]() |  | Added | fitness-cup60 | ![]() |  | Added | fitness-cup70 | ![]() |  | Added | fitness-cup80 | ![]() |  | Added | fitness-cup90 | ![]() |  | Added | icon | ![]() |  | Added | icon_empty | ![]() |  | Added | icon_open | ![]() |  | Added

Resources/Textures/Objects/Consumable/Food/bay_food.rsi

| State | Old | New | Status | --- | --- | --- | --- | | 0box-donut1 | ![]() |  | Added | 0box-donut_chaos | ![]() |  | Added | 1box-donut1 | ![]() |  | Added | 1box-donut_chaos | ![]() |  | Added | 2box-donut1 | ![]() |  | Added | 2box-donut_chaos | ![]() |  | Added | 3box-donut1 | ![]() |  | Added | 3box-donut_chaos | ![]() |  | Added | 4box-donut1 | ![]() |  | Added | 4box-donut_chaos | ![]() |  | Added | 4no_raisins | ![]() |  | Added | 5box-donut1 | ![]() |  | Added | 5box-donut_chaos | ![]() |  | Added | 6box-donut1 | ![]() |  | Added | 6box-donut_chaos | ![]() |  | Added | aesirsalad | ![]() |  | Added | aghrassh-cake | ![]() |  | Added | amanita_pie | ![]() |  | Added | amanitajelly | ![]() |  | Added | ancient_burger | ![]() |  | Added | ancient_fries | ![]() |  | Added | ancient_hburger | ![]() |  | Added | ancient_hotdog | ![]() |  | Added | ancient_pizza | ![]() |  | Added | ancient_taco | ![]() |  | Added | applecake | ![]() |  | Added | applecakeslice | ![]() |  | Added | applepie | ![]() |  | Added | bacon | ![]() |  | Added | badrecipe | ![]() |  | Added | baguette | ![]() |  | Added | bananabread | ![]() |  | Added | bananabreadslice | ![]() |  | Added | barbecue | ![]() |  | Added | bearmeat | ![]() |  | Added | beetsoup | ![]() |  | Added | berryclafoutis | ![]() |  | Added | bigbiteburger | ![]() |  | Added | birdmeat | ![]() |  | Added | birdsteak | ![]() |  | Added | birthdaycake | ![]() |  | Added | birthdaycakeslice | ![]() |  | Added | biscotti | ![]() |  | Added | bisque | ![]() |  | Added | boiledrice | ![]() |  | Added | boiledslimecore | ![]() |  | Added | brainburger | ![]() |  | Added | braincake | ![]() |  | Added | braincakeslice | ![]() |  | Added | bread | ![]() |  | Added | breadslice | ![]() |  | Added | bunbun | ![]() |  | Added | candiedapple | ![]() |  | Added | candy | ![]() |  | Added | candy_corn | ![]() |  | Added | carrotcake | ![]() |  | Added | carrotcake_slice | ![]() |  | Added | carrotfries | ![]() |  | Added | cereal_box | ![]() |  | Added | chawanmushi | ![]() |  | Added

Edit: diff updated after 1b8d14940d22d0bfa9a030745f6f0a3c5db355d0