From 2d3b4d0c277730e54b088354da990ea597c28063 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 00:51:14 +0200 Subject: [PATCH] Cadet doesn't get a gun and SecOffs only gets the gun with non lethals (#30) * Removes sec free gun on spawn Who thought that was even a good idea * Add additional comment Just so we know why it's commented out * buh * Update after discussion Cadet doesn't get a gun or magazine, secoff gets a non lethal gun but no ammo * Woops that was meant to be the cadet * Update comments --- .../Catalog/Fills/Backpacks/StarterGear/backpack.yml | 4 ++-- .../Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 4 ++-- .../Catalog/Fills/Backpacks/StarterGear/satchel.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 1e0788cccda..89adc9c4cd3 100644 --- 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 index 355e2a1aff3..3a8db627e0b 100644 --- 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 index bdedcd69a12..68c13608a2d 100644 --- 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 index b58009ae86e..480a6e0b091 100644 --- 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