Adjust Security Loadouts, adds alternative firearms (DeltaV-Station#2214

) * meow * meow * meow * meow * meow * Update security_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update role_loadouts.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update loadout_groups.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update loadout_groups.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * meow * Update security_cadet.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
DmitriTheDemon · Nov 18, 2024 · 561f9e0 · 561f9e0
1 parent 177f4e1
commit 561f9e0
Show file tree

Hide file tree

Showing 15 changed files with 189 additions and 13 deletions.
diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -93,6 +93,13 @@ loadout-group-brig-medic-outerclothing = Corpsman outer clothing
 loadout-group-prison-guard-head = Prison Guard head
 loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit
 
+loadout-group-security-gun = Security Sidearm
+loadout-group-revolver-gun = Security Revolver
+loadout-group-all-gun = Security Sidearm
+loadout-group-security-gun-ammo = Ammunition
+loadout-group-revolver-ammo = Ammunition
+loadout-group-all-ammo = Ammunition
+
 # Justice
 loadout-group-chiefjustice-head = Chief Justice head
 loadout-group-chiefjustice-jumpsuit = Chief Justice jumpsuit

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -42,7 +42,7 @@
       tags:
         - CartridgeSpecial
         - SpeedLoaderSpecial
-    proto: CartridgeSpecialRubber
+    proto: CartridgeSpecial
     capacity: 6
     chambers: [ True, True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null, null ]
@@ -67,7 +67,7 @@
       tags:
         - CartridgeSpecial
         - SpeedLoaderSpecial
-    proto: CartridgeSpecialRubber
+    proto: CartridgeSpecial
     capacity: 6
     chambers: [ True, True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null, null ]

diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml
@@ -0,0 +1,50 @@
+- type: loadout
+  id: SecurityRevolverWeaponRevolverLucky
+  storage:
+    belt:
+    - WeaponRevolverLucky
+
+- type: loadout
+  id: SecurityRevolverInspector
+  storage:
+    belt:
+    - WeaponRevolverInspector
+
+- type: loadout
+  id: SecurityFirearmSpeedLoaderMagnumRubber
+  storage:
+    back:
+    - SpeedLoaderMagnumRubber
+
+- type: loadout
+  id: SecurityFirearmSpeedLoaderMagnum
+  storage:
+    back:
+    - SpeedLoaderMagnum
+
+- type: loadout
+  id: SecurityFirearmSpeedLoaderSpecialRubber
+  storage:
+    back:
+    - SpeedLoaderSpecialRubber
+
+- type: loadout
+  id: SecurityFirearmSpeedLoaderSpecial
+  storage:
+    back:
+    - SpeedLoaderSpecial
+
+- type: loadout
+  id: SecurityFirearmWeaponRevolverFitz
+  equipment:
+    pocket1: WeaponRevolverFitz
+
+- type: loadout
+  id: SecurityFirearmWeaponRevolverK38Master
+  equipment:
+    pocket1: WeaponRevolverK38Master
+
+- type: loadout
+  id: SecurityFirearmWeaponRevolverDeckard
+  equipment:
+    pocket1: WeaponRevolverDeckard
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml
@@ -0,0 +1,31 @@
+- type: loadout
+  id: SecurityFirearmWeaponPistolPollock
+  equipment:
+    pocket1: WeaponPistolPollock
+
+- type: loadout
+  id: SecurityFirearmWeaponPistolSLP57
+  equipment:
+    pocket1: WeaponPistolSLP57
+
+- type: loadout
+  id: SecurityFirearmWeaponPistolMk58
+  equipment:
+    pocket1: WeaponPistolMk58
+
+- type: loadout
+  id: SecurityFirearmWeaponDisabler
+  equipment:
+    pocket1: WeaponDisabler
+
+- type: loadout
+  id: SecurityFirearmMagazinePistolRubber
+  storage:
+    back:
+    - MagazinePistolRubber
+
+- type: loadout
+  id: SecurityFirearmMagazinePistol
+  storage:
+    back:
+    - MagazinePistol
diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
@@ -140,6 +140,77 @@
   loadouts:
   - MimeHead
 
+## Security Guns
+- type: loadoutGroup
+  id: SecurityFirearm
+  name: loadout-group-security-gun
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - SecurityFirearmWeaponPistolPollock
+  - SecurityFirearmWeaponPistolSLP57
+  - SecurityFirearmWeaponPistolMk58
+  - SecurityFirearmWeaponDisabler
+
+- type: loadoutGroup
+  id: SecurityRevolverFirearm
+  name: loadout-group-revolver-gun
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - SecurityRevolverInspector
+  - SecurityFirearmWeaponRevolverFitz
+  - SecurityRevolverWeaponRevolverLucky
+
+- type: loadoutGroup
+  id: SecurityFirearmAmmo
+  name: loadout-group-security-gun-ammo
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - SecurityFirearmMagazinePistol
+  - SecurityFirearmMagazinePistolRubber
+
+- type: loadoutGroup
+  id: SecurityRevolverAmmo
+  name: loadout-group-revolver-ammo
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - SecurityFirearmSpeedLoaderMagnumRubber
+  - SecurityFirearmSpeedLoaderMagnum
+  - SecurityFirearmSpeedLoaderSpecialRubber
+  - SecurityFirearmSpeedLoaderSpecial
+
+- type: loadoutGroup
+  id: SecurityAllFirearm
+  name: loadout-group-all-gun
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - SecurityFirearmWeaponPistolPollock
+  - SecurityFirearmWeaponPistolSLP57
+  - SecurityFirearmWeaponPistolMk58
+  - SecurityFirearmWeaponDisabler
+  - SecurityRevolverInspector
+  - SecurityFirearmWeaponRevolverFitz
+  - SecurityRevolverWeaponRevolverLucky
+  - SecurityFirearmWeaponRevolverDeckard
+  - SecurityFirearmWeaponRevolverK38Master
+
+- type: loadoutGroup
+  id: SecurityAllAmmo
+  name: loadout-group-all-ammo
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - SecurityFirearmMagazinePistol
+  - SecurityFirearmMagazinePistolRubber
+  - SecurityFirearmSpeedLoaderMagnumRubber
+  - SecurityFirearmSpeedLoaderMagnum
+  - SecurityFirearmSpeedLoaderSpecialRubber
+  - SecurityFirearmSpeedLoaderSpecial
+
 # Justice
 ## Chief Justice
 - type: loadoutGroup

diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
@@ -28,6 +28,8 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolCorpsman
+  - SecurityFirearm
+  - SecurityFirearmAmmo
 
 # Justice
 - type: roleLoadout

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -34,7 +34,7 @@
     id: CorpsmanPDA
     ears: ClothingHeadsetBrigmedic
     belt: ClothingBeltCorpsmanWebbingFilled
-    pocket1: WeaponPistolMk58Nonlethal
+ #  pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
   storage:
     back:
     - EmergencyRollerBedSpawnFolded
@@ -44,4 +44,4 @@
     - BruteAutoInjector
     - BurnAutoInjector
     - BurnAutoInjector
-    - MagazinePistol
+  #  - MagazinePistol # DeltaV - loadouts
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -370,6 +370,8 @@
   - Trinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
+  - SecurityAllFirearm # DeltaV - loadouts
+  - SecurityAllAmmo # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobWarden
@@ -385,6 +387,8 @@
   - Trinkets
   - SecurityStar 
   - GroupSpeciesBreathToolSecurity
+  - SecurityAllFirearm # DeltaV - loadouts
+  - SecurityAllAmmo # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -401,6 +405,8 @@
   - Trinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
+  - SecurityFirearm # DeltaV - loadouts
+  - SecurityFirearmAmmo # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobDetective
@@ -416,6 +422,8 @@
   - Trinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
+  - SecurityRevolverFirearm # DeltaV - loadouts
+  - SecurityRevolverAmmo # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobSecurityCadet

diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml
@@ -40,6 +40,8 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+  - SecurityFirearm # DeltaV - loadouts
+  - SecurityFirearmAmmo # DeltaV - loadouts
 
 # Wildcards
 - type: roleLoadout

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -30,4 +30,9 @@
   equipment:
     eyes: ClothingEyesGlassesSecurity
     id: PrisonGuardPDA
-    ears: ClothingHeadsetPrisonGuard #DeltaV
+    ears: ClothingHeadsetPrisonGuard # begin DeltaV
+  storage:
+    back:
+    - Flash
+   # - MagazinePistol # end DeltaV
+
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -29,7 +29,7 @@
     eyes: ClothingEyesGlassesSecurity
     id: DetectivePDA
     ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
+    belt: ClothingBeltHolster # DeltaV - loadouts
   storage:
     back:
     - Flash

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -52,8 +52,8 @@
     id: HoSPDA
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
-    pocket1: WeaponPistolMk58Nonlethal
+  #  pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
   storage:
     back:
     - Flash
-    - MagazinePistol
+  # - MagazinePistol # DeltaV - loadouts
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -33,7 +33,7 @@
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-#    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
+    pocket1: WeaponDisabler # DeltaV - loadouts, Security Cadet doesn't spawn with a gun
     pocket2: BookSecurity
   storage:
     back:

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -27,8 +27,8 @@
   equipment:
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
+  #  pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
   storage:
     back:
     - Flash
-    - MagazinePistol
+  #  - MagazinePistol # DeltaV - loadouts
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -35,8 +35,8 @@
     eyes: ClothingEyesGlassesSecurity
     id: WardenPDA
     ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
+  #  pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
   storage:
     back:
     - Flash
-    - MagazinePistol
+  # - MagazinePistol # DeltaV - loadouts