diff --git a/Resources/Prototypes/Entities/Items/Weapons/security.yml b/Resources/Prototypes/Entities/Items/Weapons/security.yml
index cb0ccd7b73..4183ba8f4e 100644
--- a/Resources/Prototypes/Entities/Items/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Items/Weapons/security.yml
@@ -4,21 +4,21 @@
   id: Stunbaton
   components:
     - type: Sprite
-      sprite: Objects/Melee/spear.rsi
-      state: spear
+      sprite: Objects/Melee/stunbaton.rsi
+      state: stunbaton_off
 
     - type: Icon
-      sprite: Objects/Melee/spear.rsi
-      state: spear
+      sprite: Objects/Melee/stunbaton.rsi
+      state: stunbaton_off
 
     - type: Stunbaton
-      range: 1.5
+      range: 0.75
       arcwidth: 0
       arc: default
 
     - type: Item
-      Size: 24
-      sprite: Objects/Melee/spear.rsi
-      prefix: inhand
+      Size: 10
+      sprite: Objects/Melee/stunbaton.rsi
+      HeldPrefix: off
 
     - type: ItemCooldown
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json
new file mode 100644
index 0000000000..a49523ff93
--- /dev/null
+++ b/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json
@@ -0,0 +1,143 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC BY-SA 3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656",
+    "states":
+    [
+        {
+            "name": "off-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "off-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+            {
+            "name": "on-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+            ]
+        },
+            {
+            "name": "on-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+            ]
+        },
+        {
+            "name": "stunbaton_off",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+                {
+            "name": "stunbaton_nocell",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+                {
+            "name": "stunbaton_on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ]
+            ]
+        }
+
+    ]
+}
+
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..fd0560130a
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..0c01f273cb
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..540811b676
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..d983fde6fc
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png
new file mode 100644
index 0000000000..8c4fbac7fd
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png
new file mode 100644
index 0000000000..59940f44ca
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png differ
diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_on.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_on.png
new file mode 100644
index 0000000000..2132190ad4
Binary files /dev/null and b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_on.png differ