From 9029d0a9872c3a296ea2e6970294ae03328cbab8 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Wed, 12 Jul 2023 23:18:57 -0400 Subject: [PATCH] Standard issue handguns for security (#18006) * Standard issue handguns for security * fuck it: cadets ball * change the base gun to rubber bullets * whoops --- .../Fills/Backpacks/StarterGear/backpack.yml | 2 ++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 ++ .../Fills/Backpacks/StarterGear/satchel.yml | 2 ++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 24 +++++++++++++++++++ .../Roles/Jobs/Security/head_of_security.yml | 1 + .../Roles/Jobs/Security/security_cadet.yml | 1 + .../Roles/Jobs/Security/security_officer.yml | 1 + .../Prototypes/Roles/Jobs/Security/warden.yml | 1 + 8 files changed, 34 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index c734e8483d..c9a8089f64 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -27,6 +27,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true @@ -112,6 +113,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 1bc3245708..7498656d4a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -26,6 +26,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true @@ -121,6 +122,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index f0be1ca724..b590fbb0e8 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -26,6 +26,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true @@ -121,6 +122,7 @@ contents: - id: BoxSurvivalSecurity - id: Flash + - id: MagazinePistol - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 2951a80073..ae7e02444a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -160,3 +160,27 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + +- type: entity + id: WeaponPistolMk58Nonlethal + parent: WeaponPistolMk58 + 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 + gun_chamber: + name: Chamber + startingItem: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index ce06affd7f..d10ab2b43f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -46,6 +46,7 @@ gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal innerclothingskirt: ClothingUniformJumpskirtHoS satchel: ClothingBackpackSatchelHOSFilled duffelbag: ClothingBackpackDuffelHOSFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 9af646d486..0a0ba03c56 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -28,6 +28,7 @@ outerClothing: ClothingOuterArmorBasic id: SecurityCadetPDA ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58Nonlethal innerclothingskirt: ClothingUniformJumpskirtColorRed satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index cf9b3ea62e..31a0c271f8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -30,6 +30,7 @@ id: SecurityPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal innerclothingskirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index a446c2d74c..0769e3d495 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -32,6 +32,7 @@ id: WardenPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal innerclothingskirt: ClothingUniformJumpskirtWarden satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled