diff --git a/Resources/Prototypes/_CP14/Entities/Structures/well.yml b/Resources/Prototypes/_CP14/Entities/Structures/well.yml index b352041586..d9aa4e6a84 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/well.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/well.yml @@ -28,3 +28,47 @@ solution: pool - type: Drink solution: pool + +- type: entity + id: CP14StoneWellBroken + parent: CP14StoneWell + categories: [ ForkFiltered ] + name: broken well + description: A barely surviving well that's been through too much, maybe there's still water left. + components: + - type: Sprite + noRot: true + offset: 0, 0.3 + drawdepth: Mobs + sprite: _CP14/Structures/Specific/Farming/well.rsi + layers: + - state: broken + - type: SolutionContainerManager + solutions: + pool: + maxVol: 999 + reagents: + - ReagentId: Water + Quantity: 200 + +- type: entity + id: CP14StoneWellGrovelling + parent: CP14StoneWell + categories: [ ForkFiltered ] + name: grovelling well + description: A well ruined by time, overgrown with moss and grass, perhaps there was at least a couple of buckets of water left there. + components: + - type: Sprite + noRot: true + offset: 0, 0.3 + drawdepth: Mobs + sprite: _CP14/Structures/Specific/Farming/well.rsi + layers: + - state: grovelling + - type: SolutionContainerManager + solutions: + pool: + maxVol: 999 + reagents: + - ReagentId: Water + Quantity: 50 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png new file mode 100644 index 0000000000..c0d6809572 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png new file mode 100644 index 0000000000..41ec821b49 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json index 91784c23bb..e10b801c52 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json @@ -13,6 +13,14 @@ { "name": "equipped-CLOAK", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png index 9c791ce98e..98200b521e 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png and b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json index d985b0816d..549c953753 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd ", + "copyright": "Created by TheShuEd, base by resprite Jaraten", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png new file mode 100644 index 0000000000..d3af58cec8 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png new file mode 100644 index 0000000000..367648bce5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png index 23f5d0bbb7..0493ef1827 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json index 45007d99a5..5c171bd5e5 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk", + "copyright": "Created by omsoyk and gogenych", "size": { "x": 64, "y": 64 @@ -9,6 +9,12 @@ "states": [ { "name": "icon" + }, + { + "name": "grovelling" + }, + { + "name": "broken" } ] }