Skip to content

Added Lethal mode to disabler #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miguellemonstre-creator wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added Lethal mode to disabler #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
525db39
Added Lethal mode to disabler
miguellemonstre-creator Jan 7, 2026
33d8e59
Removed Mk58 from HoS (forgot he had it)
miguellemonstre-creator Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
30 changes: 28 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@
ears: ClothingHeadsetSecurity
eyes: ClothingEyesGlassesSecurity
outerClothing: ClothingOuterArmorBasic
pocket1: WeaponPistolMk58
pocket2: MagazinePistol
pocket1: WeaponDisabler
pocket2: PowerCellMedium
inhand:
- FlashlightSeclite

Expand All @@ -245,8 +245,8 @@
ears: ClothingHeadsetSecurity
eyes: ClothingEyesGlassesSecurity
outerClothing: ClothingOuterArmorBasicSlim
pocket1: WeaponPistolMk58
pocket2: MagazinePistol
pocket1: WeaponDisabler
pocket2: PowerCellMedium
inhand:
- FlashlightSeclite

Expand All @@ -262,8 +262,8 @@
ears: ClothingHeadsetSecurity
eyes: ClothingEyesGlassesSecurity
outerClothing: ClothingOuterArmorBasic
pocket1: WeaponPistolMk58
pocket2: MagazinePistol
pocket1: WeaponDisabler
pocket2: PowerCellMedium
inhand:
- FlashlightSeclite

Expand All @@ -280,8 +280,8 @@
ears: ClothingHeadsetSecurity
eyes: ClothingEyesGlassesSecurity
outerClothing: ClothingOuterArmorBasicSlim
pocket1: WeaponPistolMk58
pocket2: MagazinePistol
pocket1: WeaponDisabler
pocket2: PowerCellMedium
inhand:
- FlashlightSeclite

Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
id: HoSPDA
gloves: ClothingHandsGlovesCombat
ears: ClothingHeadsetAltSecurity
pocket1: WeaponPistolMk58
pocket1: WeaponDisabler
storage:
back:
- Flash
- MagazinePistol
- PowerCellMedium

- type: chameleonOutfit
id: HeadOfSecurityChameleonOutfit
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
equipment:
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58
pocket1: WeaponDisabler
storage:
back:
- Flash
- MagazinePistol
- PowerCellMedium

- type: chameleonOutfit
id: SecurityOfficerChameleonOutfit
Expand Down
Loading