changes

Ben10083 · Feb 6, 2024 · 719b8ed · 719b8ed
1 parent 9116ede
commit 719b8ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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