From 997f5016669c5295c1b252122c83d931dd23d8ff Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 27 Feb 2026 16:22:42 +1030 Subject: [PATCH 1/3] made sec shit --- .../ItemToggleMeleeWeaponComponent.cs | 15 ++++ .../Weapons/Melee/SharedMeleeWeaponSystem.cs | 16 +++++ .../Effects/HitImpacts/attributions.yml | 9 +++ .../Effects/HitImpacts/nightstick1.ogg | Bin 0 -> 10227 bytes .../Effects/HitImpacts/nightstick2.ogg | Bin 0 -> 10029 bytes .../_Funkystation/Weapons/attributions.yml | 14 ++++ .../Weapons/nightstick_extend.ogg | Bin 0 -> 8758 bytes .../Weapons/nightstick_retract.ogg | Bin 0 -> 7226 bytes Resources/Locale/en-US/datasets/figurines.ftl | 4 +- .../Locale/en-US/research/technologies.ftl | 2 +- .../Locale/en-US/store/uplink-catalog.ftl | 3 +- Resources/Prototypes/Alerts/alerts.yml | 4 +- .../Catalog/Fills/Crates/security.yml | 11 +-- .../Prototypes/Catalog/Fills/Items/belt.yml | 2 +- .../Catalog/Fills/Lockers/heads.yml | 5 +- .../Catalog/Fills/Lockers/security.yml | 6 +- Resources/Prototypes/Datasets/ion_storm.yml | 2 +- .../Spawners/Random/Department/security.yml | 8 +-- .../Weapons/Guns/Battery/battery_guns.yml | 14 ++-- .../Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Magic/event_spells.yml | 6 -- .../Recipes/Lathes/Packs/security.yml | 7 -- Resources/Prototypes/Research/arsenal.yml | 2 - .../Jobs/CentComm/emergencyresponseteam.yml | 21 ++---- .../Roles/Jobs/Fun/visitors_startinggear.yml | 44 ++++++------ .../Objects/Weapons/Melee/nightstick.yml | 64 ++++++++++++++++++ .../SoundCollections/hit_impacts.yml | 5 ++ .../Guidebook/Security/Security.xml | 5 +- .../Melee/nightstick.rsi/equipped-BELT.png | Bin 0 -> 245 bytes .../Weapons/Melee/nightstick.rsi/icon.png | Bin 0 -> 315 bytes .../nightstick.rsi/inhand-left-extend.png | Bin 0 -> 348 bytes .../Melee/nightstick.rsi/inhand-left.png | Bin 0 -> 247 bytes .../nightstick.rsi/inhand-right-extend.png | Bin 0 -> 338 bytes .../Melee/nightstick.rsi/inhand-right.png | Bin 0 -> 242 bytes .../Weapons/Melee/nightstick.rsi/meta.json | 40 +++++++++++ .../nightstick.rsi/nightstick_extend.png | Bin 0 -> 188 bytes .../nightstick.rsi/nightstick_handle.png | Bin 0 -> 263 bytes Resources/migration.yml | 3 + 38 files changed, 218 insertions(+), 95 deletions(-) create mode 100644 Resources/Audio/_Funkystation/Effects/HitImpacts/attributions.yml create mode 100644 Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick1.ogg create mode 100644 Resources/Audio/_Funkystation/Effects/HitImpacts/nightstick2.ogg create mode 100644 Resources/Audio/_Funkystation/Weapons/attributions.yml create mode 100644 Resources/Audio/_Funkystation/Weapons/nightstick_extend.ogg create mode 100644 Resources/Audio/_Funkystation/Weapons/nightstick_retract.ogg create mode 100644 Resources/Prototypes/_Funkystation/Entities/Objects/Weapons/Melee/nightstick.yml create mode 100644 Resources/Prototypes/_Funkystation/SoundCollections/hit_impacts.yml create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/icon.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-left-extend.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-left.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-right-extend.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-right.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/meta.json create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/nightstick_extend.png create mode 100644 Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/nightstick_handle.png diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleMeleeWeaponComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleMeleeWeaponComponent.cs index cd3ed5779c3..96050cec720 100644 --- 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 /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public bool DeactivatedSecret = false; + + // Funky + + /// + /// The factor of stamina damage, proportional to blunt damage dealt, done by the item when activated. + /// + [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] + public FixedPoint2? ActivatedBluntStaminaDamageFactor = null; + + /// + /// The factor of stamina damage, proportional to blunt damage dealt, done by the item when deactivated. + /// + [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 index f869a130157..d70fd0380b5 100644 --- 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 new file mode 100644 index 00000000000..35f26609d7f --- /dev/null +++ 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 new file mode 100644 index 0000000000000000000000000000000000000000..6be7be73cc694fcb1963b369ddf6a07ff8b03a9e GIT binary patch literal 10227 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/_Funkystation/Weapons/attributions.yml b/Resources/Audio/_Funkystation/Weapons/attributions.yml new file mode 100644 index 00000000000..a94d6d6670b --- /dev/null +++ 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 new file mode 100644 index 0000000000000000000000000000000000000000..a87eee846f7d71e745fbdaf21431d80920d730d1 GIT binary patch literal 8758 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 + - ## Flashes diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/equipped-BELT.png b/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..5426912bf998f4b77924b6bfa41c820169b64c65 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7fi1$B>G+x3>;*9#Ifr4e<27mvijen=5B^ z!Y1s{F?#Q4@WgDszg{vUQ0;?-QLp#(S6s3(YRI0u{w{Aser4u?&TT9P$2|Ui{{3q2 z`D?d)B;9yq54&@`4z`n;uot9>f#E}N@m)_3?Y4T^1KZwyuus`Pc>$xfR6z;DK_fHm i*A=`TcNiLMy?!zrQT3YY*z(W}q{q|M&t;ucLK6TlDpxuH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/icon.png b/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..92dc0d2309810f85324f4c19e1f4cfd3ff55a9cf GIT binary patch literal 315 zcmV-B0mS}^P)Px#^+`lQR9J;$U>F6XfKH&Hy6XS3d9(hbi!;&7ay4ZIhFfEkO_RTx@GMqbiZeV;K86J+)=cAU7T0Uwy z#lT44lq!~!TtFPv4gH_X^ngJ{L5<>$wgQ1O)G1Tkm(-uB4#I%Zq{evzqtw|189r&c%QF&;T;BrWBX zlcnvfxBJ@*(|hdO8C>kz7pw|zE%^DVaN`-9=d*iO-TGW}uUc)zD&N|&JN_RhObPn- zp*4D{`5>aW`{b zbVR@H{^PdlnH@3FeJ>WR(mTre-FDBaDAU=Vp)CiS=kI2|{kQJRyM}C6H@~MHt2i!& m_Pq#hi&>@g=lmlUhVb_{9sBf+mrs5OvcuEW&t;ucLK6T}GnjY) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-left.png b/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c374f80d6d768b1d2cea25b56ebea6a9453d33ef GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|HhQ`^hE&XX zd&`jPkb^+$!{r^%ITUlm#l(vER^O;tC38~AjM4GUkwdfBv@W~kRA^@S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-right-extend.png b/Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi/inhand-right-extend.png new file mode 100644 index 0000000000000000000000000000000000000000..86d342f105d642da1c4f4249e6a76030cc44b8ef GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zc|2VlLn`LH zz2%tKY#`A3aG|=RQRCkjwx?R(j?I1|5ScRbamD;49y>dCuUNDtYqHamg<602>mHhA z$R_sL1!x!;yifY@bHn|o_tzc1bb2qh;g37JqWli0UTgBQdQ)!6_WuK8-EKzt+5NL~ zQ$rVQy<9Ny+SN}P!uxU>R_QIO6r8x@W>~V>!!qX&m3O~KhKhf^7r#H%{+sEuxj$Ej zn6Cd_xAAZ9C;5L_Fv}PWQf-5`$YkE-_3$ywWU-xC8nF1rpZiK7hVB82PjCwSlyTFT zs6Rt{MPN;0=-InjsDjQ&?_b|6b3WZubLO&;uDK1XrvzO!^@|F(-|O}|>!nos cJsXBSj5mwAH;4+vtpHi&>FVdQ&MBb@03G5>?nRj+~Nlc3RxecNiNFLaq zIc;xrqN!?L*7?O-W|Zn^_9?!+urs#k#~XE7tMI=Z%O^d$U2EOZv2L$$<(24H)3@56 he*O2)IToNFR`MVDZ9KQ+eQ$tjqHfYUCv4`Yu0TJgq;&g{XLEN?xpDRY2zab&TfA%G z|Kgc)1}ijH7~ZKY=ze(T=w+4JjXX0v0`Dk3?N0i6Ih|i~=cGZ%Y6G literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index c6b80ae8e4b..4a13e389954 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -839,3 +839,6 @@ RightHandSkeleton: OrganSkeletonPersonHandRight RightLegHuman: OrganHumanLegRight TorsoSkeleton: OrganSkeletonPersonTorso RightArmSkeleton: OrganSkeletonPersonArmRight + +# TODO: When the RG-2 and its safe are ported over, uncomment the line below and add a timestamp. +#GunSafeDisabler: GunSafePistolRg2 From dc19117ec4237b4b6e5cd4544f2ae946099b234e Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 27 Feb 2026 17:51:41 +1030 Subject: [PATCH 2/3] wait forgot the migrations --- Resources/Locale/en-US/research/technologies.ftl | 3 ++- Resources/Locale/en-US/store/uplink-catalog.ftl | 5 +++-- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 1 + .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 3 +++ Resources/Prototypes/Entities/Objects/Weapons/security.yml | 1 + Resources/migration.yml | 5 +++++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 6c02e9e0632..b0b555a829b 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -28,7 +28,8 @@ 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 = Less-Lethal Ammunition # Funky - Made name more accurate +# Funky - Made name more accurate +research-technology-nonlethal-ammunition = Less-Lethal Ammunition 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 index 08690fcd6e9..a189096585c 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -244,7 +244,7 @@ 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 -# Changed the description because we don't have stun batons or disablers anymore +# Funky - 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 @@ -383,7 +383,8 @@ uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. uplink-clothing-outer-hardsuit-juggernaut-name = Cybersun Juggernaut Suit -uplink-clothing-outer-hardsuit-juggernaut-desc = Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit... and tasers. +# Funky - Changed the description because we don't have tasers anymore +uplink-clothing-outer-hardsuit-juggernaut-desc = Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit. # Misc uplink-cyberpen-name = Cybersun Pen diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 03d98eaf499..459bbdd66f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -245,6 +245,7 @@ parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeDisabler name: disabler safe + categories: [ DoNotMap ] components: - type: EntityTableContainerFill containers: 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 012e2f28703..f57f6c3426d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -612,6 +612,7 @@ parent: [WeaponDisablerPractice, BaseSecurityCommandContraband] id: WeaponDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + categories: [ DoNotMap ] components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/disabler.rsi @@ -641,6 +642,7 @@ parent: [BaseWeaponBattery, BaseSecurityContraband] id: WeaponDisablerSMG description: Advanced weapon that exhausts organic targets, weakening them until they collapse. + categories: [ DoNotMap ] components: - type: Item size: Large @@ -682,6 +684,7 @@ parent: [BaseWeaponBatterySmall, BaseSecurityContraband] id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at close range. + categories: [ DoNotMap ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 98298ef4e12..b6d566302b7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -51,6 +51,7 @@ parent: [BaseItem, BaseSecurityContraband] id: Stunbaton description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. + categories: [ DoNotMap ] components: - type: Sprite sprite: Objects/Weapons/Melee/stunbaton.rsi diff --git a/Resources/migration.yml b/Resources/migration.yml index 3c92dca20b0..8f35a425d15 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -861,5 +861,10 @@ TowelColorMaroon: null TowelColorSilver: null TowelColorMime: null +# 2026-02-27 +Stunbaton: Nightstick +WeaponDisabler: null +WeaponTaser: null + # TODO: When the RG-2 and its safe are ported over, uncomment the line below and add a timestamp. #GunSafeDisabler: GunSafePistolRg2 From 7bd1ab06c17d80dab85b961dd27a0445b2db9fd7 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 27 Feb 2026 18:13:36 +1030 Subject: [PATCH 3/3] practice blaster changes --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f57f6c3426d..9ebc2d78b5d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -566,10 +566,10 @@ - type: Appearance - type: entity - name: practice disabler + name: practice blaster # Funky - Name & description changed to no longer reference the disabler parent: BaseWeaponBatterySmall id: WeaponDisablerPractice - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless. + description: A prop blaster, designed specifically to emulate firing a real energy weapon. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi