diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index a2f02f0960..da81d464d5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -354,3 +354,36 @@
   - type: Appearance
   - type: StaticPrice
     price: 750
+
+- type: entity
+  name: advanced laser gun
+  parent: BaseWeaponBatterySmall
+  id: WeaponAdvancedLaser
+  description: An experimental laser gun with a self charging nuclear powered battery.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: RedMediumLaser
+    fireCost: 100
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 40
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 63
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png
new file mode 100644
index 0000000000..709bcf6dc3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png
new file mode 100644
index 0000000000..d6fafcdae1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png
new file mode 100644
index 0000000000..fbb7994257
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-right.png
new file mode 100644
index 0000000000..8355b6db20
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000..576dbaf48e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000..b37c686cf0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000..696730bdb4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000..8e4f20c012
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000..0d101a9cc1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
new file mode 100644
index 0000000000..40dad860e7
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/1d0e3dde0f89e7926be32a3706883c3f003931f8",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
index 8ace34ae73..8f6aa0ff73 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png
index 6d29432260..42647a9d00 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png
index c86548ce6f..be9f287abf 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png
index 592fa288e9..63af10e6a4 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
index bf8cc27c45..4d4ba7feef 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
index c959a32fd7..2b2617d856 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
index c739e0816d..de5952aa0a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
index c959a32fd7..2b2617d856 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
     "size": {
         "x": 32,
         "y": 32
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 b0db0017a5..71800c387e 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/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index 472ddd4096..81e977c298 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,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/6594/commits/6bfebf2e486961ec48ff366abd54229f6e702d50",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509",
     "size": {
         "x": 32,
         "y": 32
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 cba6570548..5e5959c1b2 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/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
index 9b2d3c4dac..a46eb7d96d 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,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi, back modified by peptide",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-  {
-    "name": "base"
-  },
-  {
-    "name": "inhand-left",
-    "directions": 4
-  },
-  {
-    "name": "inhand-right",
-    "directions": 4
-  },
-  {
-    "name": "equipped-BACKPACK",
-    "directions": 4
-  }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
 }