From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 16 Dec 2023 04:23:57 +0000 (-0600) Subject: Ports the /tg/ shotgun sprites (#22539) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e31cf20871662df6794354f66354190ed24c8074;p=space-station-14.git Ports the /tg/ shotgun sprites (#22539) * ports the /tg/ shotgun sprites * webedit fail * i'm wario and my furniture is broken * hopefully finally actually fix tests? maybe? my couch is broken * update shotgun cabinet * update shotgun cabinet MORE * ohhhhhh my god... --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 3c4fa05327..f43df5f37c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -105,12 +105,14 @@ id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Item size: Normal shape: - 0,0,4,0 - - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: db - type: Gun fireRate: 2 - type: BallisticAmmoProvider @@ -134,25 +136,22 @@ name: Enforcer parent: BaseWeaponShotgun id: WeaponShotgunEnforcer - description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells. + description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi + - type: Item + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: enforcer - type: BallisticAmmoProvider - type: entity - name: Enforcer - parent: BaseWeaponShotgun + parent: WeaponShotgunEnforcer id: WeaponShotgunEnforcerRubber - description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells. suffix: Non-Lethal components: - - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: BallisticAmmoProvider proto: ShellShotgunBeanbag @@ -166,6 +165,8 @@ size: Normal shape: - 0,0,4,0 + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: pump - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing @@ -188,6 +189,8 @@ sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Item size: Small + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: sawn - type: Gun fireRate: 4 - type: BallisticAmmoProvider @@ -261,14 +264,16 @@ id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: - - type: Item - size: Normal - shape: - - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + - type: Item + size: Normal + shape: + - 0,0,4,0 + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: improvised - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. - type: BallisticAmmoProvider diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png index dcbe062978..f593424bf5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png index ab0cac8d09..79fe8aa7cd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png index 24d2679270..c14175daad 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png deleted file mode 100644 index 9bd6baea11..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png deleted file mode 100644 index ba969a5ab1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json index df70db984b..7408c3f4ac 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide, sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png index c794549c55..1ce7995817 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png index 9d5dffa449..c5e9fb4324 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png index f6edbb2c96..f0f5dae71c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png deleted file mode 100644 index 3878a18861..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png deleted file mode 100644 index 201a669d7b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json index 23e8bc2ee0..67bfc37e93 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png deleted file mode 100644 index 9e52a5bbdd..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png deleted file mode 100644 index 34f7a40918..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json index 3a12cd6330..92bc382a42 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, inhand and back sprites modified by Flareguy", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy", "size": { "x": 32, "y": 32 @@ -10,14 +10,6 @@ { "name": "icon" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png new file mode 100644 index 0000000000..749dff75b0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png new file mode 100644 index 0000000000..ca804b8270 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png new file mode 100644 index 0000000000..82ae89a0b8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png new file mode 100644 index 0000000000..aef5cc6c71 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png new file mode 100644 index 0000000000..aa318a6151 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png new file mode 100644 index 0000000000..2cab6d7425 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..fefe1f6eb7 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "pump-inhand-left", + "directions": 4 + }, + { + "name": "pump-inhand-right", + "directions": 4 + }, + { + "name": "enforcer-inhand-left", + "directions": 4 + }, + { + "name": "enforcer-inhand-right", + "directions": 4 + }, + { + "name": "db-inhand-left", + "directions": 4 + }, + { + "name": "db-inhand-right", + "directions": 4 + }, + { + "name": "sawn-inhand-left", + "directions": 4 + }, + { + "name": "sawn-inhand-right", + "directions": 4 + }, + { + "name": "improvised-inhand-left", + "directions": 4 + }, + { + "name": "improvised-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png new file mode 100644 index 0000000000..9276fc5521 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png new file mode 100644 index 0000000000..56c4aff874 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png new file mode 100644 index 0000000000..76be394118 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png new file mode 100644 index 0000000000..a51a641f0b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png index cf99a2c2d5..233850622e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png index 67a9de667a..302e6d14b5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png index d2f0b8f80d..161c387047 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png deleted file mode 100644 index 65c7d1ff04..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png deleted file mode 100644 index 86e91dd800..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index c1c901f2eb..7408c3f4ac 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide (copy of db), sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png index f4b03e4603..1d44a5bb53 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png index da66a1846e..d4e3306e6b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png index af968888cc..4adea9fa22 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png deleted file mode 100644 index 3b847fa3cb..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png deleted file mode 100644 index 4ccf0dae98..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json index 04f71999e1..bb01559033 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi backpack sprite by Peptide, sprite modification by Jaсkal 298", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sprites edited from db_shotgun.rsi by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png index f867044e8e..7e8df53b12 100644 Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png differ diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png index 7d8a7b0531..ccdae19856 100644 Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png differ diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png index 7be5a49135..22842029db 100644 Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png differ diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png index a685c2263c..d663355383 100644 Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png differ diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json index a32bc8c8c8..7004450d7e 100644 --- a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Inspired by tg station\u0027s fireaxe cabinet https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 Made by DISCORD@ps3moira#9488", + "copyright": "Inspired by tg station\u0027s fireaxe cabinet https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 Made by DISCORD@ps3moira#9488, sprite further modified and updated by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png index bc55a68675..ef1c77c1dd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png differ