From 719b8ed3697d6fd60d8fc595f614c3edecd4fbb7 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Tue, 6 Feb 2024 18:56:59 -0500 Subject: [PATCH] changes --- code/modules/projectiles/guns/energy/nuclear.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index cd3951ac077..640f4fd64df 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -199,7 +199,7 @@ modifystate = "golden_deep_ornatepistolstun" firemodes = list( - list(mode_name="disorient", projectile_type=/obj/item/projectile/beam/disorient, modifystate="golden_deep_ornatepistolstun", fire_sound='sound/weapons/Taser.ogg', fire_delay = 4), + list(mode_name="disorient", projectile_type=/obj/item/projectile/beam/disorient, modifystate="golden_deep_ornatepistolstun", fire_sound='sound/weapons/Taser.ogg'), list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pistol, modifystate="golden_deep_ornatepistollethal", fire_sound='sound/weapons/laser1.ogg') ) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d719642273e..288a821e4fa 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -236,7 +236,7 @@ impact_type = /obj/effect/projectile/muzzle/laser/scc /obj/item/projectile/beam/disorient/on_hit(var/atom/target, var/blocked = 0) - if(ishuman(target) && blocked < 100) //Make them trip + if(ishuman(target) && blocked < 100 && !issilicon(target) && !isipc(target)) //Make them trip var/mob/living/carbon/human/H = target if(H.druggy < 75) H.druggy += 15