Security Loadouts Expansion 2 (#1025)

# Description

This PR *significantly* expands upon Loadouts available to the entire
Security Department. First to note, is that all security roles no longer
automatically spawn with a weapon, instead every security role has a
single selection choice from the new Security Duty Weapon group, with
many of the options being free or very little points. But it also now
features significantly more options available. Players can freely choose
whether they want their duty weapon loaded with Lethal vs. Nonlethal,
with a modest restriction that Lethals require some Security playtime
for Shitter Protection. The basic choices are either a Disabler, a Mk58,
or an Inspector revolver, but players can spend loadout points to "Trade
up" for a fancier gun.

Security equipment now also includes selections of magazines for one's
own Duty Weapon(The first magazine is free!), while a spare magazine can
also be bought with some loadout points.

I didn't forget Oni either, and I know they suck with guns. So Oni have
an option of taking a Truncheon as their Duty Weapon.


<details><summary><h1>Media</h1></summary>
<p>

New Duty Weapon selections

![image](https://github.com/user-attachments/assets/35d8454c-b8a3-4136-97f4-f32facdba5bf)

More Equipment selections!

![image](https://github.com/user-attachments/assets/98afbe8f-b5b8-401c-9b46-8921adadd26a)

</p>
</details>

# Changelog

:cl:
- tweak: Almost all security loadout gear is now free.
- remove: All Security roles no longer spawn with a pistol by default.
This has been moved to Loadouts.
- add: Security characters can now choose from a selection of different
firearms to use as their Duty Weapon. Disablers, Mk58, and Inspector
revolvers are free, fancier weapons such as an N1984 can be bought with
loadout points.
- add: Oni can opt to take a Truncheon in lieu of a handgun.
- add: Security characters can now take handgun magazines and spare
magazines in their loadouts.
- add: Security Backpacks to loadouts.
- fix: Fixed issues with the security belt options(webbing, belt,
holster) not correctly replacing the original item, and also not
containing items either.

Resources/Locale/en-US/loadouts/itemgroups.ftl

@@ -39,6 +39,7 @@ character-item-group-LoadoutShoesMedical = Medical Shoes
 character-item-group-LoadoutUniformsMedical = Medical Uniforms
 
 # Security
+character-item-group-LoadoutBackSecurity = Security Backpacks
 character-item-group-LoadoutBeltSecurity = Security Belts
 character-item-group-LoadoutEquipmentSecurity = Security Equipment
 character-item-group-LoadoutEyesSecurity = Security Eyewear
@@ -49,6 +50,7 @@ character-item-group-LoadoutNeckSecurity = Security Neckwear
 character-item-group-LoadoutOuterSecurity = Security Outerwear
 character-item-group-LoadoutShoesSecurity = Security Shoes
 character-item-group-LoadoutUniformsSecurity = Security Uniforms
+character-item-group-LoadoutWeaponSecurity = Security Duty Weapon
 
 # Service
 character-item-group-LoadoutEquipmentService = Service Equipment

Resources/Locale/en-US/loadouts/jobs/security.ftl

@@ -1,3 +1,20 @@
 loadout-description-LoadoutSecurityUniformJumpskirtSenior = A skirt fit for the best of the best.
 loadout-description-LoadoutSecurityUniformJumpsuitSenior = A suit fit for the best of the best.
 loadout-description-LoadoutSecurityShoesJackboots = A really nice, heavy, pair of black boots.
+# Equipment
+loadout-name-LoadoutMagazinePistolSpare = pistol magazine (.35 auto, spare)
+loadout-name-LoadoutMagazinePistolNonLethalSpare = pistol magazine (.35 auto rubber, spare)
+loadout-name-LoadoutSpeedLoaderMagnumSpare = speed loader (.45 magnum, spare)
+loadout-name-LoadoutSpeedLoaderMagnumRubberSpare = speed loader (.45 magnum rubber, spare)
+
+# Duty Weapons
+loadout-name-LoadoutSecurityMk58 = Mk58 (lethal)
+loadout-name-LoadoutSecurityMk58NonLethal = Mk58 (non-lethal)
+loadout-name-LoadoutSecurityRevolver = Inspector (lethal)
+loadout-name-LoadoutSecurityRevolverNonLethal = Inspector (non-lethal)
+loadout-name-LoadoutSecurityRevolverDeckard = Deckard (lethal)
+loadout-name-LoadoutSecurityRevolverDeckardNonLethal = Deckard (non-lethal)
+loadout-name-LoadoutSecurityPistolN1984 = N1984 (lethal)
+loadout-name-LoadoutSecurityPistolN1984NonLethal = N1984 (non-lethal)
+loadout-name-LoadoutSecurityPistolViper = Viper (lethal)
+loadout-name-LoadoutSecurityPistolViperNonLethal = Viper (non-lethal)

Resources/Prototypes/CharacterItemGroups/securityGroups.yml

@@ -51,6 +51,10 @@
       id: LoadoutClothingOuterCoatHoSTrench
     - type: loadout
       id: LoadoutClothingOuterWinterHoS
+    - type: loadout
+      id: LoadoutClothingOuterArmorBasic
+    - type: loadout
+      id: LoadoutClothingOuterArmorSlim
 
 - type: characterItemGroup
   id: LoadoutGlovesSecurity
@@ -101,6 +105,8 @@
       id: LoadoutClothingBeltCorpsmanWebbing
     - type: loadout
       id: LoadoutClothingBeltSecurity
+    - type: loadout
+      id: LoadoutClothingBeltHolster
 
 - type: characterItemGroup
   id: LoadoutEyesSecurity
@@ -125,18 +131,66 @@
       id: LoadoutClothingShoesBootsCombat
 
 - type: characterItemGroup
-  maxItems: 5 # No clue what the actual number should be.
+  maxItems: 5
   id: LoadoutEquipmentSecurity
   items:
     - type: loadout
       id: LoadoutSecurityCombatKnife
     - type: loadout
       id: LoadoutSecurityFlash
     - type: loadout
-      id: LoadoutSecurityDisabler
+      id: LoadoutMagazinePistol
+    - type: loadout
+      id: LoadoutMagazinePistolSpare
     - type: loadout
       id: LoadoutMagazinePistolRubber
+    - type: loadout
+      id: LoadoutMagazinePistolRubberSpare
+    - type: loadout
+      id: LoadoutSpeedLoaderMagnum
+    - type: loadout
+      id: LoadoutSpeedLoaderMagnumSpare
     - type: loadout
       id: LoadoutSpeedLoaderMagnumRubber
+    - type: loadout
+      id: LoadoutSpeedLoaderMagnumRubberSpare
 
+- type: characterItemGroup
+  maxItems: 1
+  id: LoadoutWeaponSecurity
+  items:
+    - type: loadout
+      id: LoadoutSecurityDisabler
+    - type: loadout
+      id: LoadoutSecurityMk58
+    - type: loadout
+      id: LoadoutSecurityMk58NonLethal
+    - type: loadout
+      id: LoadoutSecurityRevolver
+    - type: loadout
+      id: LoadoutSecurityRevolverNonLethal
+    - type: loadout
+      id: LoadoutSecurityRevolverDeckard
+    - type: loadout
+      id: LoadoutSecurityRevolverDeckardNonLethal
+    - type: loadout
+      id: LoadoutSecurityPistolN1984
+    - type: loadout
+      id: LoadoutSecurityPistolN1984NonLethal
+    - type: loadout
+      id: LoadoutSecurityPistolViper
+    - type: loadout
+      id: LoadoutSecurityPistolViperNonLethal
+    - type: loadout
+      id: LoadoutSecurityEquipmentTruncheon
 
+- type: characterItemGroup
+  maxItems: 1
+  id: LoadoutBackSecurity
+  items:
+    - type: loadout
+      id: LoadoutClothingBackSecurity
+    - type: loadout
+      id: LoadoutClothingBackSecuritySatchel
+    - type: loadout
+      id: LoadoutClothingBackSecurityDuffel

Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

@@ -35,15 +35,14 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicFilled 
+    back: ClothingBackpackBrigmedicFilled
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical
     head: ClothingHeadHatBeretCorpsman
     id: CorpsmanPDA
     ears: ClothingHeadsetBrigmedic
     belt: ClothingBeltCorpsmanWebbingFilled
-    pocket1: WeaponPistolMk58Nonlethal
   innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
   satchel: ClothingBackpackSatchelBrigmedicFilled
   duffelbag: ClothingBackpackDuffelBrigmedicFilled

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -109,6 +109,31 @@
       path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
     fireOnDropChance: 0.3
 
+- type: entity
+  id: WeaponPistolViperNonLethal
+  parent: WeaponPistolViper
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+            - MagazinePistolHighCapacity
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+
 - type: entity
   name: cobra
   parent: BaseWeaponPistol
@@ -253,7 +278,7 @@
 - type: entity
   name: N1984
   parent: WeaponPistolN1984
-  id: WeaponPistolN1984Nonlethal
+  id: WeaponPistolN1984NonLethal
   suffix: Non-lethal
   components:
   - type: ItemSlots

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -79,6 +79,19 @@
   - type: StaticPrice
     price: 1500
 
+- type: entity
+  name: Deckard
+  parent: WeaponRevolverDeckard
+  id: WeaponRevolverDeckardNonLethal
+  description: A rare, custom-built revolver. Use when you need to spare the Replicants. Comes with .45 magnum rubber.
+  components:
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeMagnum
+        - SpeedLoaderMagnum
+    proto: CartridgeMagnumRubber
+
 - type: entity
   name: Inspector
   parent: BaseWeaponRevolver
@@ -94,6 +107,19 @@
     chambers: [ True, True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null, null ]
 
+- type: entity
+  name: Inspector
+  parent: WeaponRevolverInspector
+  id: WeaponRevolverInspectorNonLethal
+  description: A detective's best friend. Comes loaded with .45 magnum rubber.
+  components:
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeMagnum
+        - SpeedLoaderMagnum
+    proto: CartridgeMagnumRubber
+
 - type: entity
   name: Mateba
   parent: BaseWeaponRevolver