now correct

TauCetiStation · Mar 27, 2024 · a4a0233 · a4a0233
1 parent 3bcd50c
commit a4a0233
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/code/datums/spells/emplosion.dm b/code/datums/spells/emplosion.dm
@@ -8,6 +8,6 @@
 /obj/effect/proc_holder/spell/targeted/emplosion/cast(list/targets)
 
 	for(var/mob/living/target in targets)
-		empulse(target.loc, emp_heavy, emp_light, custom_sound = EMP_SEBB)
+		empulse(target.loc, emp_heavy, emp_light, custom_effects = EMP_SEBB)
 
 	return
diff --git a/code/game/gamemodes/modes_gameplays/ninja/suit/n_suit_verbs/ninja_empulse.dm b/code/game/gamemodes/modes_gameplays/ninja/suit/n_suit_verbs/ninja_empulse.dm
@@ -12,7 +12,7 @@
 	if(!ninjacost(C,0)) // EMP's now cost 1,000Energy about 30%
 		var/mob/living/carbon/human/U = affecting
 		playsound(U, 'sound/effects/EMPulse.ogg', VOL_EFFECTS_MASTER)
-		empulse(U, 2, 3, custom_sound = EMP_SEBB) //Procs sure are nice. Slightly weaker than wizard's disable tch.
+		empulse(U, 2, 3, custom_effects = EMP_SEBB) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2
 		cell.use(C*10)
 	return
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
@@ -6,7 +6,7 @@
 	pixel_y = -175
 	appearance_flags = RESET_COLOR
 
-/proc/empulse(turf/epicenter, heavy_range, light_range, log=0, custom_sound = EMP_DEFAULT)
+/proc/empulse(turf/epicenter, heavy_range, light_range, log=0, custom_effects = EMP_DEFAULT)
 	if(!epicenter) return
 
 	if(!istype(epicenter, /turf))
@@ -20,7 +20,7 @@
 
 	SEND_SIGNAL(SSexplosions, COMSIG_EXPLOSIONS_EMPULSE, epicenter, heavy_range, light_range)
 
-	if(heavy_range >= 4)
+	if(custom_effects == EMP_SEBB)
 		var/obj/effect/overlay/temp/sebb/S = new(epicenter)
 		S.anchored = TRUE
 		QDEL_IN(S, 1 SECOND)
@@ -35,7 +35,7 @@
 	if(heavy_range > light_range)
 		light_range = heavy_range
 	for(var/mob/M in range(heavy_range, epicenter))
-		M.playsound_local(null, custom_sound, VOL_EFFECTS_MASTER, null, FALSE)
+		M.playsound_local(null, custom_effects, VOL_EFFECTS_MASTER, null, FALSE)
 
 	for(var/atom/T in range(light_range, epicenter))
 		var/distance = get_dist(epicenter, T)

diff --git a/code/game/objects/items/mines.dm b/code/game/objects/items/mines.dm
@@ -128,7 +128,7 @@
 	icon_state = "empmine"
 
 /obj/item/mine/emp/trigger_act(obj)
-	empulse(src, 2, 3, custom_sound = EMP_SEBB)
+	empulse(src, 2, 3, custom_effects = EMP_SEBB)
 
 /obj/item/mine/emp/anchored
 	anchored = TRUE
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -7,7 +7,7 @@
 
 /obj/item/weapon/grenade/empgrenade/prime()
 	..()
-	if(empulse(src, 4, 10, custom_sound = EMP_SEBB))
+	if(empulse(src, 4, 10, custom_effects = EMP_SEBB))
 		qdel(src)
 	return
 
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
@@ -361,7 +361,7 @@
 /datum/action/item_action/implant/emp_implant/Activate()
 	var/obj/item/weapon/implant/emp/S = target
 	if (S.uses > 0)
-		empulse(S.imp_in, 3, 5, custom_sound = EMP_SEBB)
+		empulse(S.imp_in, 3, 5, custom_effects = EMP_SEBB)
 		S.uses--
 		if (!S.uses)
 			qdel(S)

diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
@@ -175,7 +175,7 @@
 	damage = 10
 
 /obj/item/projectile/missile/emp/on_hit(atom/target, def_zone = BP_CHEST, blocked = 0)
-	empulse(target, 4, 10, custom_sound = EMP_SEBB)
+	empulse(target, 4, 10, custom_effects = EMP_SEBB)
 	return 1
 
 /obj/item/projectile/anti_singulo

diff --git a/code/modules/research/xenoarchaeology/artifact/effects/emp.dm b/code/modules/research/xenoarchaeology/artifact/effects/emp.dm
@@ -13,4 +13,4 @@
 	empulse(get_turf(holder), range / 2, range)
 
 /datum/artifact_effect/emp/DoEffectDestroy()
-	empulse(get_turf(holder), 7, range, custom_sound = EMP_SEBB)
+	empulse(get_turf(holder), 7, range, custom_effects = EMP_SEBB)