Mra`z (#166)

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:

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

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

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

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

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

Resources/Prototypes/tags.yml

@@ -1196,4 +1196,7 @@
 - type: Tag
   id: Crystal
 
+- type: Tag
+  id: ZombifyableByMelee
+
 # WHITE END

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"
+    }
+  ]
+}

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
     }
   ]
-}
+}

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",

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 @@
       ]
     }
   ]
-}
+}

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
     }
   ]
-}
+}

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 @@
       ]
     }
   ]
-}
+}