diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 9f8bbf84ba..24a9809199 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -37,6 +37,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-optimized-ballistics = Optimized Ballistics
 research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing
+research-technology-advanced-riot-control = Advanced Riot Control
 research-technology-handheld-electrical-propulsion = Handheld Electrical Propulsion
 
 research-technology-basic-robotics = Basic Robotics
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 2ac431b873..cca60eac6a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -57,6 +57,32 @@
     intensitySlope: 1.5
     maxIntensity: 200
 
+- type: entity
+  name: truncheon
+  parent: BaseItem
+  id: Truncheon
+  description: A rigid, steel-studded baton, meant to harm.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/truncheon.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 18
+  - type: Item
+    size: 30
+  - type: Clothing
+    sprite: Objects\Weapons\Melee\truncheon.rsi
+    quickEquip: false
+    slots:
+    - Belt
+  - type: DisarmMalus
+    malus: 0.225
+  - type: Appearance
+  - type: StaticPrice
+    price: 100
+
 - type: entity
   name: flash
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fba103c5cd..86057f2e01 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -455,6 +455,7 @@
       - SignalTrigger
       - VoiceTrigger
       - TimerTrigger
+      - Truncheon
       - FlashPayload
       - ExplosivePayload
       - WeaponLaserCarbine
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 8814fb1336..d995a7701e 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -20,6 +20,14 @@
     Steel: 300
     Plastic: 300
 
+- type: latheRecipe
+  id: Truncheon
+  result: Truncheon
+  completetime: 2
+  materials:
+    Steel: 300
+    Plastic: 300
+
 - type: latheRecipe
   id: WeaponLaserCarbine
   result: WeaponLaserCarbine
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 64f8dc3401..1b5d739213 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -1,4 +1,4 @@
-# Tier 1
+# Tier 1
 
 - type: technology
   id: SalvageWeapons
@@ -130,6 +130,18 @@
   recipeUnlocks:
   - WeaponXrayCannon
 
+- type: technology
+  id: AdvancedRiotControl
+  name: research-technology-advanced-riot-control
+  icon:
+    sprite: Objects/Weapons/Melee/truncheon.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 8000
+  recipeUnlocks:
+  - Truncheon
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..5426912bf9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png
new file mode 100644
index 0000000000..3de91ca294
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png
new file mode 100644
index 0000000000..1a6205030f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png
new file mode 100644
index 0000000000..06897312dd
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/meta.json
new file mode 100644
index 0000000000..dabc70fa71
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    { 
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}