diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index c83b0e6de1..babb18dd98 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -121,7 +121,7 @@ Thus, the two variables affect pump operation are set in New():
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+			investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 			message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
 			. = TRUE
@@ -139,7 +139,7 @@ Thus, the two variables affect pump operation are set in New():
 				. = TRUE
 			if(.)
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+				investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 				message_admins("Pump, [src.name], was set to [target_pressure] kPa by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 				log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
 	update_icon()
@@ -186,7 +186,7 @@ Thus, the two variables affect pump operation are set in New():
 		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		else
-			investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+			investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 			message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] unwrenched a pump at [x], [y], [z]")
 			return 1
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej
deleted file mode 100644
index d2bdc85865..0000000000
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej
+++ /dev/null
@@ -1,19 +0,0 @@
-diff a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm	(rejected hunks)
-@@ -119,7 +119,7 @@ Thus, the two variables affect pump operation are set in New():
- 	switch(action)
- 		if("power")
- 			on = !on
--			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
-+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
- 			. = TRUE
- 		if("pressure")
- 			var/pressure = params["pressure"]
-@@ -135,7 +135,7 @@ Thus, the two variables affect pump operation are set in New():
- 				. = TRUE
- 			if(.)
- 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
--				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
-+				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
- 	update_icon()
- 
- /obj/machinery/atmospherics/components/binary/pump/atmosinit()
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 85d667509c..aea169130b 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -121,7 +121,7 @@ Thus, the two variables affect pump operation are set in New():
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+			investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 			message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
 
@@ -140,7 +140,7 @@ Thus, the two variables affect pump operation are set in New():
 				. = TRUE
 			if(.)
 				transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
-				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 				message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 				log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
 	update_icon()
@@ -183,7 +183,7 @@ Thus, the two variables affect pump operation are set in New():
 		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		else
-			investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+			investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 			message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] unwrenched a volume pump at [x], [y], [z]")
 
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej
deleted file mode 100644
index 6fab304724..0000000000
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej
+++ /dev/null
@@ -1,19 +0,0 @@
-diff a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm	(rejected hunks)
-@@ -119,7 +119,7 @@ Thus, the two variables affect pump operation are set in New():
- 	switch(action)
- 		if("power")
- 			on = !on
--			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
-+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
- 			. = TRUE
- 		if("rate")
- 			var/rate = params["rate"]
-@@ -135,7 +135,7 @@ Thus, the two variables affect pump operation are set in New():
- 				. = TRUE
- 			if(.)
- 				transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
--				investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", "atmos")
-+				investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS)
- 	update_icon()
- 
- /obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 80f9a61679..f5d62ba611 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -100,7 +100,7 @@
 	if(SSticker && SSticker.IsRoundInProgress())
 		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("Emitter deleted at ([x],[y],[z])")
-		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
+		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]", INVESTIGATE_SINGULO)
 	QDEL_NULL(sparks)
 	return ..()
 
diff --git a/code/modules/power/singularity/emitter.dm.rej b/code/modules/power/singularity/emitter.dm.rej
deleted file mode 100644
index 8b61066484..0000000000
--- a/code/modules/power/singularity/emitter.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm	(rejected hunks)
-@@ -101,7 +101,7 @@
- 		var/turf/T = get_turf(src)
- 		message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
- 		log_game("Emitter deleted at [COORD(T)]")
--		investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]","singulo")
-+		investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]", INVESTIGATE_SINGULO)
- 	QDEL_NULL(sparks)
- 	return ..()
- 
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index d15a72a6b7..ba025b7529 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -195,7 +195,7 @@
 		var/area/area = get_area(src)
 		message_admins("SMES deleted at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
 		log_game("SMES deleted at ([area.name])")
-		investigate_log("<font color='red'>deleted</font> at ([area.name])","singulo")
+		investigate_log("<font color='red'>deleted</font> at ([area.name])", INVESTIGATE_SINGULO)
 	if(terminal)
 		disconnect_terminal()
 	return ..()
diff --git a/code/modules/power/smes.dm.rej b/code/modules/power/smes.dm.rej
deleted file mode 100644
index cb12ea4fbb..0000000000
--- a/code/modules/power/smes.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/modules/power/smes.dm b/code/modules/power/smes.dm	(rejected hunks)
-@@ -196,7 +196,7 @@
- 		var/turf/T = get_turf(src)
- 		message_admins("SMES deleted at [A][ADMIN_JMP(T)]")
- 		log_game("SMES deleted at [A][COORD(T)]")
--		investigate_log("<font color='red'>deleted</font> at [A][COORD(T)]","singulo")
-+		investigate_log("<font color='red'>deleted</font> at [A][COORD(T)]", INVESTIGATE_SINGULO)
- 	if(terminal)
- 		disconnect_terminal()
- 	return ..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b6c93979c1..dea263231a 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -388,11 +388,11 @@
 		return FALSE	// This stops people from being able to really power up the supermatter
 				// Then bring it inside to explode instantly upon landing on a valid turf.
 	if(!istype(Proj.firer, /obj/machinery/power/emitter))
-		investigate_log("has been hit by [Proj] fired by [Proj.firer]", "supermatter")
+		investigate_log("has been hit by [Proj] fired by [Proj.firer]", INVESTIGATE_SUPERMATTER)
 	if(Proj.flag != "bullet")
 		power += Proj.damage * config_bullet_energy
 		if(!has_been_powered)
-			investigate_log("has been powered for the first time.", "supermatter")
+			investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER)
 			message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
 			has_been_powered = TRUE
 	else if(takes_damage)
diff --git a/code/modules/power/supermatter/supermatter.dm.rej b/code/modules/power/supermatter/supermatter.dm.rej
deleted file mode 100644
index 784fbb78b7..0000000000
--- a/code/modules/power/supermatter/supermatter.dm.rej
+++ /dev/null
@@ -1,15 +0,0 @@
-diff a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm	(rejected hunks)
-@@ -388,11 +388,11 @@
- 		return 0	// This stops people from being able to really power up the supermatter
- 				// Then bring it inside to explode instantly upon landing on a valid turf.
- 	if(!istype(Proj.firer, /obj/machinery/power/emitter))
--		investigate_log("has been hit by [Proj] fired by [Proj.firer]", "supermatter")
-+		investigate_log("has been hit by [Proj] fired by [Proj.firer]", INVESTIGATE_SUPERMATTER)
- 	if(Proj.flag != "bullet")
- 		power += Proj.damage * config_bullet_energy
- 		if(!has_been_powered)
--			investigate_log("has been powered for the first time.", "supermatter")
-+			investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER)
- 			message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
- 			has_been_powered = 1
- 	else if(takes_damage)