Merge branch 'Pot' of https://github.com/frosty-dev/ss14-core into Pot

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -123,8 +123,6 @@
   components:
     - type: StorageFill
       contents:
-        - id: PackedSoil
-          prob: 0.10
         - id: Lantern
           prob: 0.20
         - id: Wirecutter
@@ -188,6 +186,8 @@
           prob: 0.10
         - id: BarberScissors
           prob: 0.05
+        - id: PackedSoil # WD
+          prob: 0.05
         # Syndicate loot
         - id: null
           prob: 0.95
@@ -596,6 +596,8 @@
           prob: 0.10
         - id: BarberScissors
           prob: 0.05
+        - id: PackedSoil # WD
+          prob: 0.05
         # Syndicate loot
         - id: null
           prob: 0.95

Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml

@@ -2,7 +2,7 @@
   parent: CrateHydroponics
   id: CratePackedSoil
   name: ящик с почвой
-  description: Ящик, содержащий три упаковки с почвой
+  description: Ящик, содержащий пять упаковок с почвой.
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml

@@ -5,7 +5,7 @@
   parent: BaseItem
   components:
   - type: Item
-    size: Small
+    size: Normal
   - type: Sprite
     sprite: White/Structures/growingpot.rsi
     state: packed_soil
@@ -13,4 +13,4 @@
     tags:
       - PackedSoilTag
   - type: StaticPrice
-    price: 50
+    price: 10

Resources/Prototypes/_White/tags.yml

@@ -150,3 +150,6 @@
 
 - type: Tag
   id: MagazineKalashLightRifleBox
+
+- type: Tag
+  id: PackedSoilTag

Resources/Prototypes/tags.yml

@@ -948,9 +948,6 @@
 - type: Tag
   id: Ore
 
-- type: Tag
-  id: PackedSoilTag # WD edit
-
 - type: Tag
   id: Packet
 

Resources/Textures/White/Structures/growingpot.rsi/meta.json

@@ -1,20 +1,20 @@
 {
-  "version": 1,
+    "version": 1,
-  "license": "CC-BY-SA-3.0",
+    "license": "CC-BY-SA-3.0",
-  "copyright": "dosharus",
+    "copyright": "dosharus",
-  "size": {
+    "size": {
-    "x": 32,
+        "x": 32,
-    "y": 32
+        "y": 32
-  },
-  "states": [
-    {
-      "name": "pot_filled"
     },
-    {
+    "states": [
-      "name": "pot_empty"
+        {
-    },
+            "name": "pot_filled"
-    {
+        },
-      "name": "packed_soil"
+        {
-    }
+            "name": "pot_empty"
-  ]
+        },
+        {
+            "name": "packed_soil"
+        }
+    ]
 }