Standard issue handguns for security (#18006)

* Standard issue handguns for security

* fuck it: cadets ball

* change the base gun to rubber bullets

* whoops
This commit is contained in:
Nemanja
2023-07-12 23:18:57 -04:00
committed by GitHub
parent e932eec8ff
commit 9029d0a987
8 changed files with 34 additions and 0 deletions

View File

@@ -27,6 +27,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true
@@ -112,6 +113,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true

View File

@@ -26,6 +26,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true
@@ -121,6 +122,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true

View File

@@ -26,6 +26,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true
@@ -121,6 +122,7 @@
contents: contents:
- id: BoxSurvivalSecurity - id: BoxSurvivalSecurity
- id: Flash - id: Flash
- id: MagazinePistol
- type: entity - type: entity
noSpawn: true noSpawn: true

View File

@@ -160,3 +160,27 @@
- SemiAuto - SemiAuto
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/mk58.ogg 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

View File

@@ -46,6 +46,7 @@
gloves: ClothingHandsGlovesCombat gloves: ClothingHandsGlovesCombat
ears: ClothingHeadsetAltSecurity ears: ClothingHeadsetAltSecurity
belt: ClothingBeltSecurityFilled belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtHoS innerclothingskirt: ClothingUniformJumpskirtHoS
satchel: ClothingBackpackSatchelHOSFilled satchel: ClothingBackpackSatchelHOSFilled
duffelbag: ClothingBackpackDuffelHOSFilled duffelbag: ClothingBackpackDuffelHOSFilled

View File

@@ -28,6 +28,7 @@
outerClothing: ClothingOuterArmorBasic outerClothing: ClothingOuterArmorBasic
id: SecurityCadetPDA id: SecurityCadetPDA
ears: ClothingHeadsetSecurity ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtColorRed innerclothingskirt: ClothingUniformJumpskirtColorRed
satchel: ClothingBackpackSatchelSecurityFilled satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled

View File

@@ -30,6 +30,7 @@
id: SecurityPDA id: SecurityPDA
ears: ClothingHeadsetSecurity ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtSec innerclothingskirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled

View File

@@ -32,6 +32,7 @@
id: WardenPDA id: WardenPDA
ears: ClothingHeadsetSecurity ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtWarden innerclothingskirt: ClothingUniformJumpskirtWarden
satchel: ClothingBackpackSatchelSecurityFilled satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled