diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index d78bf4c8eb..eb0d6fac72 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/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 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml index a2cb16f2ed..986229067a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -2,9 +2,9 @@ parent: CrateHydroponics id: CratePackedSoil name: ящик с почвой - description: Ящик, содержащий три упаковки с почвой + description: Ящик, содержащий пять упаковок с почвой. components: - type: StorageFill contents: - id: PackedSoil - amount: 5 \ No newline at end of file + amount: 5 diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml index fca3f60b0c..74b9712e62 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml +++ b/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 \ No newline at end of file + price: 10 diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index de4f84d435..7fd259942a 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -150,3 +150,6 @@ - type: Tag id: MagazineKalashLightRifleBox + +- type: Tag + id: PackedSoilTag diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 60979abde5..baea3b07c5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -948,9 +948,6 @@ - type: Tag id: Ore -- type: Tag - id: PackedSoilTag # WD edit - - type: Tag id: Packet diff --git a/Resources/Textures/White/Structures/growingpot.rsi/meta.json b/Resources/Textures/White/Structures/growingpot.rsi/meta.json index 3104bcb7f2..cc817e7473 100644 --- a/Resources/Textures/White/Structures/growingpot.rsi/meta.json +++ b/Resources/Textures/White/Structures/growingpot.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "dosharus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "pot_filled" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dosharus", + "size": { + "x": 32, + "y": 32 }, - { - "name": "pot_empty" - }, - { - "name": "packed_soil" - } - ] -} + "states": [ + { + "name": "pot_filled" + }, + { + "name": "pot_empty" + }, + { + "name": "packed_soil" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png index 4ed659ebbe..9368408eeb 100644 Binary files a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png and b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png differ