From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Date: Mon, 30 Oct 2023 00:09:18 +0000 (+0100) Subject: Space Asshole Gear (#21243) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e22d3a4cb032198c4b760bf8cb108a54c770ed24;p=space-station-14.git Space Asshole Gear (#21243) * Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer --- diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index a7c3a55338..1118a9efc7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -344,3 +344,14 @@ modifiers: coefficients: Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatSpaceAsshole + name: the coat of space asshole + description: And there he was... + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/space_asshole.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/space_asshole.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml new file mode 100644 index 0000000000..8a3754c035 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -0,0 +1,22 @@ +- type: entity + name: sledgehammer + parent: BaseItem + id: Sledgehammer + description: The perfect tool for wanton carnage. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/sledgehammer.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 14 + Structural: 15 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + Structural: 60 + - type: Item + size: 80 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d0b9d06f5e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png new file mode 100644 index 0000000000..41a9647456 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png new file mode 100644 index 0000000000..afafe24513 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png new file mode 100644 index 0000000000..144d4d7e44 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json new file mode 100644 index 0000000000..70ee956fea --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Psychpsyo for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png new file mode 100644 index 0000000000..287c02bd94 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png new file mode 100644 index 0000000000..d728c4112b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png new file mode 100644 index 0000000000..b5889d3dee Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json new file mode 100644 index 0000000000..b8bbd26672 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Psychpsyo for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..c0ae12785e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..21c9a32a7f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png differ