From f585cbb5cc97d9e809b7fe545948dc4ec2f65073 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Mon, 14 Aug 2023 15:49:31 +0300 Subject: [PATCH] Fixes (#298) * Belt egun * Glass disabler --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++++ .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 3 +-- 2 files changed, 5 insertions(+), 2 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 fbcb55ae38..4565732d3a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -715,6 +715,10 @@ shader: unshaded - type: Clothing sprite: Objects/Weapons/Guns/Battery/egun.rsi + quickEquip: false + slots: + - Belt + - suitStorage - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 8b36433acf..78f3eff959 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -224,8 +224,7 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable + - Opaque fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide