]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Ports the /tg/ shotgun sprites (#22539)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Sat, 16 Dec 2023 04:23:57 +0000 (22:23 -0600)
committerGitHub <noreply@github.com>
Sat, 16 Dec 2023 04:23:57 +0000 (23:23 -0500)
* 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...

45 files changed:
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png

index 3c4fa0532742b08386b308762d1104b8c9a67c0e..f43df5f37cb040149a19f7e68d6485b3a3f6e5d1 100644 (file)
   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
   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
 
     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
     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
   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
index dcbe062978ecbcdb9f1a2c6e1ada2286b9952fc6..f593424bf52ad6fb330b46abd406efa2e2f8f02e 100644 (file)
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
index ab0cac8d09673d5674233048e25b7f1b831a1e5c..79fe8aa7cd242b9bd0909256d2d3032664d293cd 100644 (file)
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
index 24d26792706bff608c1fda238ccb9accc2a264d1..c14175daad50c4da80f1dc4b69d591be415e9bda 100644 (file)
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 (file)
index 9bd6bae..0000000
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 (file)
index ba969a5..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png and /dev/null differ
index df70db984ba4673adb1f310f012c3213cdd48608..7408c3f4ac82c38dc2266417055eb2c1532ab612 100644 (file)
@@ -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
         {
             "name": "bolt-open"
         },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
index c794549c55faae7f32d12678ff65b85e84c7ece4..1ce79958173281e91f24caa94969d17065e80b88 100644 (file)
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
index 9d5dffa44997fda2ae525f786d17c13b2bba1dc2..c5e9fb432414425101c12d0499a31c53bf1d2dde 100644 (file)
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
index f6edbb2c964bb3f55f583eb7922fc2722b3243cd..f0f5dae71cbb122b3e3ec3bbd0666de5ef0b3121 100644 (file)
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 (file)
index 3878a18..0000000
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 (file)
index 201a669..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png and /dev/null differ
index 23e8bc2ee0ba96edee0c503150ba14f8ce35be70..67bfc37e93c64857085248d3af62138ec7906113 100644 (file)
@@ -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
         {
             "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 (file)
index 9e52a5b..0000000
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 (file)
index 34f7a40..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png and /dev/null differ
index 3a12cd63300cba5dc0cc9ad539ab294602381d2d..92bc382a42bdb06928af888ccdefc1e83c3330f5 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..749dff7
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 (file)
index 0000000..ca804b8
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 (file)
index 0000000..82ae89a
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 (file)
index 0000000..aef5cc6
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 (file)
index 0000000..aa318a6
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 (file)
index 0000000..2cab6d7
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 (file)
index 0000000..fefe1f6
--- /dev/null
@@ -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 (file)
index 0000000..9276fc5
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 (file)
index 0000000..56c4aff
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 (file)
index 0000000..76be394
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 (file)
index 0000000..a51a641
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png differ
index cf99a2c2d558b139914e9f57800ea899fc849807..233850622eb3237b506eb3a8a2bff0b64910ba92 100644 (file)
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
index 67a9de667a3fb7f8f23b070565ea64762d2926cb..302e6d14b5d37c97e510a1fe1d56e249ab33df90 100644 (file)
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
index d2f0b8f80d09fd74dee6bb812620cc1a7b5a9422..161c387047d794373475771c83cd25dd5be81459 100644 (file)
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 (file)
index 65c7d1f..0000000
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 (file)
index 86e91dd..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png and /dev/null differ
index c1c901f2eb0399df9aed33f1601f04de7ff8f8d1..7408c3f4ac82c38dc2266417055eb2c1532ab612 100644 (file)
@@ -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
         {
             "name": "bolt-open"
         },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
index f4b03e4603cc963b8b22a5f7bab3066146bab357..1d44a5bb539eb74e652d98a0b0687a783a34b36c 100644 (file)
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
index da66a1846ed015371d89d3812ec9a3867263e35f..d4e3306e6bb1b20fcb71183369b02a7a90f221ce 100644 (file)
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
index af968888cc3f9c0f77d90e0b72d4500af8608701..4adea9fa224c1de8fe743f15d5c07de2813c8d24 100644 (file)
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 (file)
index 3b847fa..0000000
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 (file)
index 4ccf0da..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png and /dev/null differ
index 04f71999e15bd553e604908c76b95fe15ca1e1ef..bb01559033be9b2aa7faaafee1c5b56517adf9d1 100644 (file)
@@ -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
         {
             "name": "bolt-open"
         },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
index f867044e8ea79743302196a7b5de781925636361..7e8df53b12c47ebfe08fd745522bd5290faf223b 100644 (file)
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
index 7d8a7b05312ca4b9fc1f2669ee779d9f58f06f30..ccdae198566f0725e700c403bc5246f82de997f0 100644 (file)
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
index 7be5a4913547cb1c0192ba403ede828db79cef8d..22842029dbe7290b4779e6a49115703711bc1278 100644 (file)
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
index a685c2263cba342df0af943f3f3d2d6b2bb3c6b0..d66335538302951cd469164dbb4dccd28924b98b 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png differ
index a32bc8c8c8f1c765891ff932bd66171ca694c28f..7004450d7ef6c8adbb912854592a637aed4e2a3a 100644 (file)
@@ -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
index bc55a68675112ec524392a7fecf39aa6df1c66db..ef1c77c1ddae5f8ba79bcf25cb82ab26bb5a6242 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png and b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png differ