diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 2113c8197c..c40abb4fe8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -53,7 +53,7 @@ whitelist: tags: - CartridgeAntiMaterial - capacity: 1 + capacity: 5 proto: CartridgeAntiMaterial - type: entity diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/base.png index 4350f73416..aa013d6ece 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-left.png index ee156b3847..3660a84331 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-right.png index b6b6da5da6..8850966e10 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-0.png index 7ef2a79205..1ef876e2b8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-1.png index 7ef2a79205..1ef876e2b8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json index 0a43455140..606cfe0db1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json @@ -1,36 +1,36 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454", + "size": { + "x": 32, + "y": 32 }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "rocket0-inhand-left", - "directions": 4 - }, - { - "name": "rocket0-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png index aa36fdfe14..1d4e2a365e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png index c988a13565..341dec9c08 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/base.png deleted file mode 100644 index f40dd350a3..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-closed.png deleted file mode 100644 index c4efe9ce9d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-open.png deleted file mode 100644 index 81cca7aac2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/icon.png deleted file mode 100644 index b632e03602..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-left.png deleted file mode 100644 index 187c36a79b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-right.png deleted file mode 100644 index e4da10b24e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json deleted file mode 100644 index 72863fbac8..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png index 0faddef927..b0db0017a5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png deleted file mode 100644 index c4efe9ce9d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png deleted file mode 100644 index 00ceb0ff47..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/icon.png deleted file mode 100644 index 2fe3906ba3..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png index 7b5f1d484e..a934299d5f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png index a7f5f5cca7..aefb7fc2ae 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json index 72863fbac8..a79ecc2823 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json @@ -1,31 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/6594/commits/6bfebf2e486961ec48ff366abd54229f6e702d50", + "size": { + "x": 32, + "y": 32 }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/base.png index 83594e068f..cba6570548 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png deleted file mode 100644 index 5bc658f755..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-open.png deleted file mode 100644 index 5943b1f751..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png deleted file mode 100644 index 6a17ed46a4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png index fac9dcfc5b..32798d6bbf 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png index 850640d3d0..bf24324363 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json index b31fc04c70..a6f5a3df3f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json @@ -1,24 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "inhand-left", "directions": 4