diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index e506995929..f31169fe01 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -58,6 +58,16 @@ category: Food group: market +- type: cargoProduct + id: FoodCrateKvassTank + icon: + sprite: Structures/Storage/kvass.rsi + state: kvass + product: KvassTankFull + cost: 2000 + category: Food + group: market + - type: cargoProduct id: FoodSoftdrinks icon: diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index 7a19389b0e..43fb1033dc 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -770,14 +770,6 @@ - MeatyOreUniforms #gloves -- type: listing - id: MeatyClothingHandsGlovesIhscombat - productEntity: ClothingHandsGlovesIhscombat - cost: - MeatyOreCoin: 2 - categories: - - MeatyOreGloves - - type: listing id: MeatyClothingHandsGlovesLatex productEntity: ClothingHandsGlovesLatex diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 7ca25d682b..ef34b5f269 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -22,11 +22,6 @@ speechSounds: Slime - type: TypingIndicator proto: slime - - type: Vocal - sounds: - Male: MaleSlime - Female: FemaleSlime - Unsexed: MaleSlime - type: Damageable damageContainer: Biological damageModifierSet: Slime diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 8274c5421c..d2be6be078 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2210,3 +2210,20 @@ Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/bloodglass.rsi + + +- type: entity + parent: DrinkGlassBase + id: DrinkKvassGlass + name: kvass glass + description: A cool refreshing drink with a taste of socialism. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Kvass + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/kvass.rsi diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index b7e41d9e9c..b16fe13b6f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -201,3 +201,25 @@ - type: ExaminableSolution solution: tank + +# Kvass +- type: entity + id: KvassTank + parent: StorageTank + suffix: Empty + components: + - type: Sprite + sprite: Structures/Storage/kvass.rsi + state: kvass + +- type: entity + parent: KvassTank + id: KvassTankFull + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Kvass + Quantity: 1500 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 299126ade8..463c9e489f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -424,3 +424,27 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/rewriter.rsi state: icon + +- type: reagent + id: TheMartinez + name: reagent-name-the-martinez + parent: BaseDrink + desc: reagent-desc-the-martinez + physicalDesc: reagent-physical-desc-vibrant + flavor: themartinez + color: "#75b1f0" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/the_martinez.rsi + state: icon + +- type: reagent + id: Kvass + name: reagent-name-kvass + parent: BaseDrink + desc: reagent-desc-kvass + physicalDesc: reagent-physical-desc-bubbly + flavor: bread + color: "#381600" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/kvass.rsi + state: icon diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index c37b9e6ec5..f7bc3274ae 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1196,4 +1196,7 @@ - type: Tag id: Crystal +- type: Tag + id: ZombifyableByMelee + # WHITE END diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png new file mode 100644 index 0000000000..9053f51e96 Binary files /dev/null and b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png differ diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json new file mode 100644 index 0000000000..93131a3e8b --- /dev/null +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/a66d78ef5b3339bbaa13a8d3167af266485d4589", + "size": { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "kvass" + } + ] +} diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index f07af7057c..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_bee_kini.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_bee_kini.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 66c2882a8d..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_bee_kini.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_binder.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_binder.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index ac58a25393..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_binder.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_binder_strapless.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_binder_strapless.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 7e0300624c..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_binder_strapless.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_kinky.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_kinky.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index d6a8bb1507..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_kinky.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_neko.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_neko.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index b2338088d9..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_neko.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 5fd0389773..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless_alt.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless_alt.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index a28ca85cb3..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_strapless_alt.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 68dcc2c45a..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming_alt.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming_alt.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 661233dbb1..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_swimming_alt.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/bra_thin.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/bra_thin.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 6fa219fcdb..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/bra_thin.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/cow.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/cow.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index f027165aad..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/cow.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_body.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/fishnet_body.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index ad9e0d3e1f..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_body.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_gloves.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/fishnet_gloves.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 0f663e95e9..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_gloves.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_sleeves.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/fishnet_sleeves.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 102140cca5..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/fishnet_sleeves.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/halterneck_bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/halterneck_bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 095e1f1a73..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/halterneck_bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/capitan/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/capitan/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 0d6149b85d..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/capitan/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/ce/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/ce/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 8161142c51..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/ce/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/cmo/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/cmo/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index a8c8c67798..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/cmo/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/hop/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/hop/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index e48e8ab75f..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/hop/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/hos/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/hos/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 2aa6533cb0..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/hos/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/qm/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/qm/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 34ff46afb2..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/qm/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/rd/bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/heads/rd/bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 2e762f82c2..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/heads/rd/bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/shibari.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/shibari.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 704fff3e03..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/shibari.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/shibari_sleeves.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/shibari_sleeves.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 4b4ebaf1c6..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/shibari_sleeves.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/sportsbra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/sportsbra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index b191bbc9dc..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/sportsbra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/sportsbraalt.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/sportsbraalt.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index eced4e98ad..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/sportsbraalt.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/striped_bra.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/striped_bra.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index c6a30a3cca..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/striped_bra.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Clothing/Underwear/Top/tubetop.rsi/equipped-UNDERWEART-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Top/tubetop.rsi/equipped-UNDERWEART-body-slim.png deleted file mode 100644 index 68a647b8a8..0000000000 Binary files a/Resources/Textures/White/Clothing/Underwear/Top/tubetop.rsi/equipped-UNDERWEART-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json index 0a57e7fd9e..0a099793fa 100644 --- a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json +++ b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json @@ -4,6 +4,8 @@ "x": 32, "y": 32 }, + "license": "CC-BY-SA-3.0", + "copyright": "Poxuy", "states": [ { "name": "stunbaton_nocell" @@ -35,4 +37,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json index fcba7ab495..6a1cc56701 100644 --- a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json +++ b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json @@ -4,6 +4,8 @@ "x": 32, "y": 32 }, + "license": "CC-BY-SA-3.0", + "copyright": "Poxuy", "states": [ { "name": "icon", diff --git a/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json index 65ad07bfed..f2273f93ce 100644 --- a/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json +++ b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json @@ -4,6 +4,8 @@ "x": 32, "y": 32 }, + "license": "CC-BY-SA-3.0", + "copyright": "Poxuy", "states": [ { "name": "animated", @@ -100,4 +102,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json index 5e9a1d6849..682005fed4 100644 --- a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json +++ b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json @@ -4,6 +4,8 @@ "x": 32, "y": 32 }, + "license": "CC-BY-SA-3.0", + "copyright": "Poxuy", "states": [ { "name": "m_ears_fox_ADJ", @@ -18,4 +20,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json index 8320faa77e..fdd5683f35 100644 --- a/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json +++ b/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json @@ -4,6 +4,8 @@ "x": 32, "y": 32 }, + "license": "CC-BY-SA-3.0", + "copyright": "Poxuy", "states": [ { "name": "m_tail_oni_BEHIND", @@ -108,4 +110,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/White/Objects/Devices/jukebox.rsi/right_hand.png b/Resources/Textures/White/Objects/Devices/jukebox.rsi/right_hand.png deleted file mode 100644 index e274125d1d..0000000000 Binary files a/Resources/Textures/White/Objects/Devices/jukebox.rsi/right_hand.png and /dev/null differ