diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 3e84ddafcf..c74b6c0568 100644 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -12,7 +12,7 @@ - type: Sprite sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing - sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi + sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi - type: BallisticAmmoProvider proto: ShellShotgunResinShot capacity: 6 diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png index 3c58ab782f..2131365766 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png index 82d86a8353..33443f1755 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png index 82d86a8353..33443f1755 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png index 9d4c3a776c..c69510f238 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index 3add3a471b..e4d8847bc0 100644 --- a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -3,7 +3,7 @@ "license": "CC-BY-NC-4.0", "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { - "x": 32, + "x": 48, "y": 32 }, "states": [ @@ -12,14 +12,6 @@ }, { "name": "bolt-open" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png index a186d2fac5..9c5bafd2f9 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png index 946a290f27..86d5a9b3a7 100644 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json index 6c1d1581e8..95ab2ba002 100644 --- a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json +++ b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-NC-4.0", "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", "size": { - "x": 64, - "y": 64 + "x": 32, + "y": 32 }, "states": [ { @@ -14,14 +14,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png deleted file mode 100644 index 09fbaae551..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png deleted file mode 100644 index 00b475f6b4..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..33443f1755 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..33443f1755 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json new file mode 100644 index 0000000000..eef8805607 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file