diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 659b9b4b7d..6c087ed0c5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -8,6 +8,15 @@ - type: Sprite sprite: Objects/Specific/Janitorial/mop.rsi state: mop + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 - type: Item size: 15 sprite: Objects/Specific/Janitorial/mop.rsi diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json index acea5438bc..5ef52189ca 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll", "size": { "x": 32, "y": 32 @@ -17,6 +17,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..8fd9168b55 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..1bdd20aa48 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right.png differ