Merge branch 'master' into hairtodaygonetomorrow

DeltaV-Station · Sep 27, 2023 · 6fe84d9 · 6fe84d9
2 parents 9f75eee + 8169cf7
commit 6fe84d9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -113,3 +113,11 @@ Entries:
       message: Removed Dwarf from roundstart choices.
   id: 18
   time: '2023-09-27T21:09:01.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: >-
+        Cadets no longer gets a gun and no more spare mags for Security
+        Officers.
+  id: 19
+  time: '2023-09-27T22:51:15.0000000+00:00'
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -27,8 +27,8 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
-      
+#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -26,8 +26,8 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
-      
+#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -40,8 +40,8 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
-      
+#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelSecurity

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -28,7 +28,7 @@
     outerClothing: ClothingOuterArmorBasic
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
+#    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
   innerclothingskirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled