diff --git a/code/__HELPERS/yelling.dm b/code/__HELPERS/yelling.dm
index cf8ca52417..d4d6e5ac95 100644
--- a/code/__HELPERS/yelling.dm
+++ b/code/__HELPERS/yelling.dm
@@ -25,7 +25,7 @@
 	var/dir
 	var/returned
 #define RUN_YELL(_T, _P, _D) \
-	returned = max(powers[_T] - _T.get_yelling_resistance() - 1, 0); \
+	returned = max(_P - _T.get_yelling_resistance() - 1, 0); \
 	_T.maptext = "[returned]";
 
 	var/list/turf/edges_next = list()
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 7ed90253c8..6b90cfd62c 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -58,7 +58,7 @@
 	. = ..()
 	hit_thing(AM)
 
-/obj/effect/decal/chempuff/proc/run(atom/target)
+/obj/effect/decal/chempuff/proc/run_puff(atom/target)
 	set waitfor = FALSE
 	for(var/i in 1 to range)
 		range_left--
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index de4151a82d..b90815d543 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -86,7 +86,7 @@
 		reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
 	D.color = mix_color_from_reagents(D.reagents.reagent_list)
 	last_spray = world.time
-	D.run(A)
+	D.run_puff(A)
 
 /obj/item/reagent_containers/spray/attack_self(mob/user)
 	stream_mode = !stream_mode
diff --git a/tgstation.dme b/tgstation.dme
index 30229b1cda..f7069d4783 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3111,7 +3111,6 @@
 #include "code\modules\projectiles\guns\ballistic\automatic.dm"
 #include "code\modules\projectiles\guns\ballistic\bow.dm"
 #include "code\modules\projectiles\guns\ballistic\derringer.dm"
-#include "code\modules\projectiles\guns\ballistic\laser_gatling.dm"
 #include "code\modules\projectiles\guns\ballistic\launchers.dm"
 #include "code\modules\projectiles\guns\ballistic\magweapon.dm"
 #include "code\modules\projectiles\guns\ballistic\pistol.dm"
@@ -3122,6 +3121,7 @@
 #include "code\modules\projectiles\guns\energy\energy_gun.dm"
 #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
+#include "code\modules\projectiles\guns\energy\laser_gatling.dm"
 #include "code\modules\projectiles\guns\energy\megabuster.dm"
 #include "code\modules\projectiles\guns\energy\mounted.dm"
 #include "code\modules\projectiles\guns\energy\plasma_cit.dm"