From 525db39ed4f616f16258abbadd44e270b6ca1719 Mon Sep 17 00:00:00 2001 From: miguellemonstre-creator Date: Wed, 7 Jan 2026 15:13:44 +0100 Subject: [PATCH 1/2] Added Lethal mode to disabler --- .../Weapons/Guns/Battery/battery_guns.yml | 8 ++++- .../Weapons/Guns/Projectiles/projectiles.yml | 30 +++++++++++++++++-- .../Roles/Jobs/Fun/visitors_startinggear.yml | 16 +++++----- .../Roles/Jobs/Security/security_cadet.yml | 4 +-- .../Roles/Jobs/Security/security_officer.yml | 4 +-- 5 files changed, 47 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8ff6cf5e83..c3d34737ad 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -489,7 +489,7 @@ name: disabler parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ] id: WeaponDisabler - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + description: A standard Nanotrasen weapon that shoots ionized gas at targets. It has a lethal mode and a non-lethal disabling mode. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/disabler.rsi @@ -508,6 +508,12 @@ - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 62.5 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletDisabler + fireCost: 62.5 + - proto: BulletDisablerLaser + fireCost: 62.5 - type: GuideHelp guides: - Security diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index cd69edb08a..cdf5d74469 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -249,10 +249,12 @@ projectile: shape: !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" + bounds: "-0.1,-0.1,0.1,0.1" hard: false mask: - Opaque + - Impassable + - BulletImpassable fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide @@ -266,6 +268,28 @@ collection: WeakHit forceSound: true +- type: entity + name : laser bolt + id: BulletDisablerLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: StaminaDamageOnCollide + damage: 0 + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 17 + soundHit: + collection: WeakHit + forceSound: true + - type: entity name : disabler bolt practice id: BulletDisablerPractice @@ -288,10 +312,12 @@ projectile: shape: !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" + bounds: "-0.1,-0.1,0.1,0.1" hard: false mask: - Opaque + - Impassable + - BulletImpassable fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml index d3bb481ff7..79cb9612a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml @@ -227,8 +227,8 @@ ears: ClothingHeadsetSecurity eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterArmorBasic - pocket1: WeaponPistolMk58 - pocket2: MagazinePistol + pocket1: WeaponDisabler + pocket2: PowerCellMedium inhand: - FlashlightSeclite @@ -245,8 +245,8 @@ ears: ClothingHeadsetSecurity eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterArmorBasicSlim - pocket1: WeaponPistolMk58 - pocket2: MagazinePistol + pocket1: WeaponDisabler + pocket2: PowerCellMedium inhand: - FlashlightSeclite @@ -262,8 +262,8 @@ ears: ClothingHeadsetSecurity eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterArmorBasic - pocket1: WeaponPistolMk58 - pocket2: MagazinePistol + pocket1: WeaponDisabler + pocket2: PowerCellMedium inhand: - FlashlightSeclite @@ -280,8 +280,8 @@ ears: ClothingHeadsetSecurity eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterArmorBasicSlim - pocket1: WeaponPistolMk58 - pocket2: MagazinePistol + pocket1: WeaponDisabler + pocket2: PowerCellMedium inhand: - FlashlightSeclite diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index cac79f4822..b28999685d 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -33,12 +33,12 @@ id: SecurityCadetPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58 + pocket1: WeaponDisabler pocket2: BookSecurity storage: back: - Flash - - MagazinePistol + - PowerCellMedium - type: chameleonOutfit id: SecurityCadetChameleonOutfit diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 432c6b0d3c..b17e0b8a59 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -27,11 +27,11 @@ equipment: eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58 + pocket1: WeaponDisabler storage: back: - Flash - - MagazinePistol + - PowerCellMedium - type: chameleonOutfit id: SecurityOfficerChameleonOutfit From 33d8e5912bc4c53f5c2452d275e160de40943d61 Mon Sep 17 00:00:00 2001 From: miguellemonstre-creator Date: Wed, 7 Jan 2026 15:34:08 +0100 Subject: [PATCH 2/2] Removed Mk58 from HoS (forgot he had it) --- Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7db7429263..e4b424a8e2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -46,11 +46,11 @@ id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity - pocket1: WeaponPistolMk58 + pocket1: WeaponDisabler storage: back: - Flash - - MagazinePistol + - PowerCellMedium - type: chameleonOutfit id: HeadOfSecurityChameleonOutfit