funky-station · pirakaplant · Feb 27, 2026 · Feb 27, 2026
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleMeleeWeaponComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleMeleeWeaponComponent.cs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
@@ -70,4 +71,18 @@ public sealed partial class ItemToggleMeleeWeaponComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public bool DeactivatedSecret = false;
+
+    // Funky
+
+    /// <summary>
+    ///     The factor of stamina damage, proportional to blunt damage dealt, done by the item when activated.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public FixedPoint2? ActivatedBluntStaminaDamageFactor = null;
+
+    /// <summary>
+    ///     The factor of stamina damage, proportional to blunt damage dealt, done by the item when deactivated.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public FixedPoint2? DeactivatedBluntStaminaDamageFactor = null;
 }
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -1059,6 +1059,15 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
             {
                 meleeWeapon.Hidden = false;
             }
+
+            // Funky
+            if (itemToggleMelee.ActivatedBluntStaminaDamageFactor != null)
+            {
+                //Setting deactivated damage to the weapon's regular value before changing it.
+                itemToggleMelee.DeactivatedBluntStaminaDamageFactor ??= meleeWeapon.BluntStaminaDamageFactor;
+                meleeWeapon.BluntStaminaDamageFactor = (FixedPoint2)itemToggleMelee.ActivatedBluntStaminaDamageFactor;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.BluntStaminaDamageFactor));
+            }
         }
         else
         {
@@ -1087,6 +1096,13 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
             {
                 meleeWeapon.Hidden = true;
             }
+
+            // Funky
+            if (itemToggleMelee.DeactivatedBluntStaminaDamageFactor != null)
+            {
+                meleeWeapon.BluntStaminaDamageFactor = (FixedPoint2)itemToggleMelee.DeactivatedBluntStaminaDamageFactor;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.BluntStaminaDamageFactor));
+            }
         }
     }
 }
diff --git a/Resources/Audio/_Funkystation/Effects/HitImpacts/attributions.yml b/Resources/Audio/_Funkystation/Effects/HitImpacts/attributions.yml
@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2026 W.xyz() <84605679+pirakaplant@users.noreply.github.com>
+#
+# SPDX-License-Identifier: MIT
+
+
+- files: ["nightstick1.ogg", "nightstick2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by @IamJustHereYknow (GitHub), sourced from CC0 sounds by SnowfightStudios, WasabiWielder, and User391915396 (all Freesound)."
+  source: "https://freesound.org/people/SnowFightStudios/sounds/669883/" # and https://freesound.org/people/WasabiWielder/sounds/323375/ and https://freesound.org/people/User391915396/sounds/370238/ but this YAML template only lets you list one source at a time
diff --git a/Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick1.ogg b/Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick1.ogg
diff --git a/Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick2.ogg b/Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick2.ogg
diff --git a/Resources/Audio/_Funkystation/Weapons/attributions.yml b/Resources/Audio/_Funkystation/Weapons/attributions.yml
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2026 W.xyz() <84605679+pirakaplant@users.noreply.github.com>
+#
+# SPDX-License-Identifier: MIT
+
+
+- files: ["nightstick_extend.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Clipped from two sounds by @pirakaplant (GitHub): one by Tairblenn (Freesound) under CC0, the other by Brsjak (Freesound) under CC-BY-4.0."
+  source: "https://freesound.org/people/Brsjak/sounds/482880/" # and https://freesound.org/people/Tairblenn/sounds/538019/ but this YAML template only lets you list one source at a time
+
+- files: ["nightstick_retract.ogg"]
+  license: "CC0-1.0"
+  copyright: "Clipped from a sound from Tairblenn (Freesound), also under CC0, by @pirakaplant (GitHub)."
+  source: "https://freesound.org/people/Tairblenn/sounds/538019/"
diff --git a/Resources/Audio/_Funkystation/Weapons/nightstick_extend.ogg b/Resources/Audio/_Funkystation/Weapons/nightstick_extend.ogg
diff --git a/Resources/Audio/_Funkystation/Weapons/nightstick_retract.ogg b/Resources/Audio/_Funkystation/Weapons/nightstick_retract.ogg
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -133,7 +133,7 @@ figurines-security-1 = I am the law!
 figurines-security-2 = You have violated article 1984.
 figurines-security-3 = Whenever I get bored I use the clown as target practice.
 figurines-security-4 = You have two rights: to remain silent and to cry about it.
-figurines-security-5 = Harmbaton? It sure as hell harms!
+figurines-security-5 = It's called a nightstick because it's gonna beat the living daylights outta you.
 figurines-security-6 = Space law? Never heard of it.
 figurines-security-7 = Random search! Hand it over.
 figurines-security-8 = I love donuts.
@@ -202,7 +202,7 @@ figurines-clown-7 = Can I have AA? Please?
 figurines-clown-8 = I'm a clown, but you're the whole circus!
 
 figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
-figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
+figurines-greytider-2 = Uh-oh, who's lost their nightstick?
 figurines-greytider-3 = Robust.
 figurines-greytider-4 = I'm not me without a toolbox.
 figurines-greytider-5 = Grey tide station wide!

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -28,7 +28,7 @@ research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
 research-technology-special-means = Special Means
 research-technology-weaponized-laser-manipulation = Weaponized Laser Manipulation
-research-technology-nonlethal-ammunition = Nonlethal Ammunition
+research-technology-nonlethal-ammunition = Less-Lethal Ammunition # Funky - Made name more accurate
 research-technology-practice-ammunition = Practice Ammunition
 research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -244,7 +244,8 @@ uplink-observation-kit-name = Observation Kit
 uplink-observation-kit-desc = Includes surveillance camera monitor board and security hud disguised as sunglasses.
 
 uplink-emp-kit-name = Electrical Disruptor Kit
-uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry: Disables disablers, stuns stunbatons, discharges laser guns! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt actual firearms.
+# Changed the description because we don't have stun batons or disablers anymore
+uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry, to show those laser-losers who's in charge! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt ballistic firearms.
 
 uplink-decoy-kit-name = Decoy Kit
 uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RND. Comes with five realistic balloons, four decoy grenades, and some snap poppers!

diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
@@ -170,8 +170,8 @@
 - type: alert
   id: Stun
   icons:
-  - sprite: /Textures/Objects/Weapons/Melee/stunbaton.rsi #Should probably draw a proper icon
-    state: stunbaton_off
+  - sprite: /Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi # Funky - Stun batons aren't used to stun anymore. Original comment suggested making a separate icon so that's another alternative
+    state: icon
   name: alerts-stunned-name
   description: alerts-stunned-desc
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -45,20 +45,21 @@
 - type: entity
   parent: CrateSecgear
   id: CrateSecurityNonlethal
-  name: nonlethals crate
-  description: Contains a mix of disablers, stun batons, and flashes. Requires Security access to open.
+  name: less-lethals crate
+  description: Contains a mix of nightsticks, flashes, shell guns, and beanbag shells. Requires Security access to open.
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponDisabler
-          amount: 3
-        - id: Stunbaton
+        - id: Nightstick
           amount: 3
         - id: BoxFlashbang
         - id: Flash
           amount: 3
+        - id: WeaponFlareGunSecurity # Funky
+          amount: 3
+        - id: BoxBeanbag # Funky - That's 5 shots for each, plus 1 extra to squabble over
 #        - Pepperspray
 #        - GrenadeTeargas
 

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -83,7 +83,7 @@
   id: BeltSecurityEntityTable
   table: !type:AllSelector
     children:
-    - id: Stunbaton
+    - id: Nightstick # Funky
     - id: Handcuffs
       amount: 2
     - id: HoloprojectorSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -114,7 +114,6 @@
       prob: 0.1
     - id: RubberStampCaptain
     - id: SpaceCash1000
-    - id: WeaponDisabler
     - id: ClothingEyesGlassesCommand
     - id: OrganSkeletonPersonHead # A skull to accompany your skeleton crew
       conditions:
@@ -201,7 +200,7 @@
     - id: ClothingNeckGoldmedal
     - id: DoorRemoteService
     - id: HoPIDCard
-    - id: WeaponDisabler
+    # TODO: Port mecha-cane to replace the disabler
     - id: ClothingEyesHudCommand
     - id: PlushieLizardJobHeadofpersonnel
       prob: 0.02
@@ -400,8 +399,6 @@
     - id: HoloprojectorSecurity
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
-    - id: WeaponDisabler
-    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
     - id: PlushieLizardJobHeadofsecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -76,8 +76,6 @@
   table: !type:AllSelector
     children:
     - id: FlashlightSeclite
-    - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -122,8 +120,6 @@
     children:
     - id: FlashlightSeclite
       prob: 0.8
-    - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -161,7 +157,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
-    - id: WeaponTaser
+    - id: WeaponTaser # Funky - We're 100% getting rid of brigmed anyway, so I'm not even going to bother touching this
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2

diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -709,6 +709,7 @@
   - MINING TOOLS
   - MONKEYS
   - MULTITOOLS
+  - NIGHTSTICKS
   - ORES
   - OXYGEN TANKS
   - PACKETS
@@ -744,7 +745,6 @@
   - SPACESUITS
   - SPESOS
   - STEEL SHEETS
-  - STUN BATONS
   - SUITS
   - SUNGLASSES
   - SWORDS

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
@@ -43,8 +43,6 @@
         - BoxHandcuff
         - BoxFlashbang
         - TearGasGrenade
-        - WeaponDisabler
-        - Stunbaton
       rareChance: 0.05
       prototypes:
         - Flash
@@ -55,7 +53,7 @@
         - SecurityWhistle
         - Tourniquet
       chance: 0.85
- 
+
 # Armory loot spawner
 # Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill.
 - type: entity
@@ -87,7 +85,6 @@
         - ClothingOuterArmorRiot
         - ClothingOuterArmorBulletproof
 #        - WeaponSubMachineGunWt550
-        - WeaponDisabler
         - WeaponPistolMk58
         - WeaponRifleLecter
         - WeaponSubMachineGunDrozd
@@ -114,7 +111,6 @@
       rareChance: 0.05
       prototypes:
 #        - WeaponSubMachineGunWt550
-        - WeaponDisabler
         - WeaponPistolMk58
         - WeaponRifleLecter
         - WeaponSubMachineGunDrozd
@@ -148,4 +144,4 @@
         - ClothingOuterArmorRiot
         - ClothingOuterArmorBulletproof
       chance: 0.95
-      offset: 0.0
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -914,7 +914,7 @@
   name: energy shotgun
   parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponEnergyShotgun
-  description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
+  description: A one-of-a-kind prototype energy weapon that uses two different shotgun configurations. It offers the possibility of both focused and wide shots, making it a versatile weapon. # Funky
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
@@ -938,13 +938,10 @@
   - type: BatteryAmmoProvider
     proto: BulletLaserSpreadNarrow
     fireCost: 80
-  - type: BatteryWeaponFireModes
+  - type: BatteryWeaponFireModes # Funky - Removed disabler mode
     fireModes:
     - proto: BulletLaserSpreadNarrow
       fireCost: 80
-    - proto: BulletDisablerSmgSpread
-      fireCost: 48
-      pacifismAllowedMode: true
   - type: Item
     size: Large
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
@@ -958,7 +955,7 @@
   name: energy magnum
   parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
   id: WeaponEnergyMagnum
-  description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling.
+  description: A high powered self-charging energy pistol designed for elite security personnel. It has has two firing modes, allowing for either high damage or window piercing. # Funky
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
@@ -988,15 +985,12 @@
   - type: BatteryAmmoProvider
     proto: BulletLaserMagnum
     fireCost: 150
-  - type: BatteryWeaponFireModes
+  - type: BatteryWeaponFireModes # Funky - Removed disabler mode
     fireModes:
     - proto: BulletLaserMagnum
       fireCost: 150
     - proto: BulletLaserWindowPiercingMagnum
       fireCost: 150
-    - proto: BulletDisabler
-      fireCost: 62.5
-      pacifismAllowedMode: true
   - type: BatterySelfRecharger
     autoRechargeRate: 48
     autoRechargePauseTime: 10

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -547,7 +547,6 @@
     - SecurityExplosives
     - SecurityAmmo
     - SecurityWeapons
-    - SecurityDisablers
   - type: EmagLatheRecipes
     emagStaticPacks:
     - SyndicateAmmoStatic

diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml
@@ -136,12 +136,6 @@
         orGroup: Guns
       - id: WeaponDisablerPractice
         orGroup: Guns
-      - id: WeaponDisabler
-        orGroup: Guns
-      - id: WeaponDisablerSMG
-        orGroup: Guns
-      - id: WeaponTaser
-        orGroup: Guns
       - id: WeaponAntiqueLaser
         orGroup: Guns
       - id: WeaponAdvancedLaser

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -62,7 +62,6 @@
   id: SecurityWeaponsStatic
   recipes:
   - Flash
-  - Stunbaton
   - CombatKnife
   - RiotShield
 
@@ -139,9 +138,3 @@
   - WeaponLaserCarbine
   - WeaponXrayCannon
   - WeaponTemperatureGun
-
-- type: latheRecipePack
-  id: SecurityDisablers
-  recipes:
-  - WeaponDisabler
-  - WeaponDisablerSMG
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -84,7 +84,6 @@
   - MagazineShotgunBeanbag
   - BoxShellTranquilizer
   - BoxBeanbag
-  - WeaponDisabler
 
 - type: technology
   id: UraniumMunitions
@@ -120,7 +119,6 @@
   - Truncheon
   - TelescopicShield
   - HoloprojectorSecurity
-  - WeaponDisablerSMG
 
 - type: technology
   id: ExplosiveTechnology