From 793f89569bfc7554df3bea7a44d783c6a020acdf Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:49:25 -0600 Subject: [PATCH] Reticence once again deals stamina damage (#19764) --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index afa4e95bd03..3c441e3c697 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -289,7 +289,7 @@ fire_sound = 'sound/weapons/gunshots/gunshot_silenced.ogg' icon_state = "mecha_mime" equip_cooldown = 15 - projectile = /obj/item/projectile/bullet/mime + projectile = /obj/item/projectile/bullet/mime/nonlethal projectiles = 20 projectile_energy_cost = 50 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 04a32ec7ed5..6607346cc73 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -223,6 +223,10 @@ for(var/obj/item/mecha_parts/mecha_equipment/weapon/honker in chassis.equipment) honker.set_ready_state(0) +/obj/item/projectile/bullet/mime/nonlethal + damage = 0 /// We deal no normal damage... + stamina = 40 /// ...Rather a large amount of stamina damage. Used in the mime mecha + /obj/item/projectile/bullet/mime/fake damage = 0 nodamage = TRUE