Simple-Station · EctoplasmIsGood · Apr 28, 2025
@@ -1 +1 @@
-civiliandisabler-extenddescription-security = This weapon is legal to own and carry without a license on NanoTrasen stations, but may be considered as an accessory equivalent to a weapon if used in a crime.
+civiliandisabler-extenddescription-security = This weapon is legal to own and carry without a license for command members on NanoTrasen stations, but may be considered as an accessory equivalent to a weapon if used in a crime.
@@ -90,7 +90,6 @@
       - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit
         prob: 0.25
       - id: ClothingBeltSecurityFilled
-      - id: ClothingBeltCorporateJudo # Goobstation - Martial Arts
       - id: Flash
         prob: 0.5
       - id: ClothingEyesGlassesSunglasses

@@ -27,6 +27,7 @@
     ClothingOuterArmorDuraVest: 2
     ClothingHeadHelmetBasic: 2
     BreachingCharge: 8
+    ClothingBeltCorporateJudo: 2
   # security officers need to follow a diet regimen!
   contrabandInventory:
     FoodDonutHomer: 12

@@ -26,9 +26,7 @@
     - type: loadout
       id: LoadoutCommandTelescopicBaton
     - type: loadout
-      id: LoadoutCommandDisabler
-    - type: loadout
-      id: LoadoutCommandStunBaton
+      id: LoadoutCommandCivilianDisabler
     - type: loadout
       id: LoadoutCommandFlash
 

@@ -383,7 +383,6 @@
     - SyringeBluespace
   #  - WeaponForceGun
     - WeaponLaserSvalinn
-    - WeaponCivilianDisabler
     - WeaponProtoKineticAccelerator
   #  - WeaponTetherGun
   #  - WeaponGrapplingGun
@@ -460,6 +459,7 @@
     - WeaponLaserCannon
     - WeaponLaserCarbine
     - WeaponXrayCannon
+    - WeaponCivilianDisabler
     - WeaponEnergyGun       # DeltaV - Energy Gun
     - WeaponEnergyGunMini   # DeltaV - Miniature Energy Gun
     - WeaponEnergyGunPistol # DeltaV - PDW-9 Energy Pistol
@@ -1101,6 +1101,7 @@
       - WeaponEnergyGun
       - WeaponEnergyGunMini
       - WeaponEnergyGunPistol
+      - WeaponCivilianDisabler
       - WeaponGunLaserCarbineAutomatic
       - CartridgeSpecialIncendiary
       - CartridgeSpecialUranium

@@ -696,19 +696,6 @@
       group: LoadoutMedkits
 
 #Misc Items
-- type: loadout
-  id: LoadoutCivilianDisabler
-  category: Items
-  cost: 5
-  canBeHeirloom: true
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-      - Prisoner
-  items:
-  - WeaponCivilianDisabler
-
 - type: loadout
   id: LoadoutItemFlash
   category: Items

@@ -22,7 +22,7 @@
   - TelescopicBaton
 
 - type: loadout
-  id: LoadoutCommandDisabler
+  id: LoadoutCommandCivilianDisabler
   category: JobsCommandAUncategorized
   cost: 2
   exclusive: true
@@ -33,21 +33,7 @@
       departments:
       - Command
   items:
-  - WeaponDisabler
-
-- type: loadout
-  id: LoadoutCommandStunBaton
-  category: JobsCommandAUncategorized
-  cost: 1
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutCommandSelfDefense
-    - !type:CharacterDepartmentRequirement
-      departments:
-      - Command
-  items:
-  - Stunbaton
+  - WeaponCivilianDisabler
 
 - type: loadout
   id: LoadoutCommandFlash
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		civiliandisabler-extenddescription-security = This weapon is legal to own and carry without a license on NanoTrasen stations, but may be considered as an accessory equivalent to a weapon if used in a crime.
		civiliandisabler-extenddescription-security = This weapon is legal to own and carry without a license for command members on NanoTrasen stations, but may be considered as an accessory equivalent to a weapon if used in a crime.