diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm
index f9df86cde9c..d46be6b2d36 100644
--- a/code/__DEFINES/logging.dm
+++ b/code/__DEFINES/logging.dm
@@ -4,6 +4,7 @@
#define INVESTIGATE_BOTANY "botany"
#define INVESTIGATE_CARGO "cargo"
#define INVESTIGATE_CRAFTING "crafting"
+#define INVESTIGATE_ENGINE "engine"
#define INVESTIGATE_EXONET "exonet"
#define INVESTIGATE_EXPERIMENTOR "experimentor"
#define INVESTIGATE_GRAVITY "gravity"
@@ -14,8 +15,6 @@
#define INVESTIGATE_RADIATION "radiation"
#define INVESTIGATE_RECORDS "records"
#define INVESTIGATE_RESEARCH "research"
-#define INVESTIGATE_SINGULO "singulo"
-#define INVESTIGATE_SUPERMATTER "supermatter"
#define INVESTIGATE_TELESCI "telesci"
#define INVESTIGATE_WIRES "wires"
diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm
index 0eea5a8b2da..d0076b9863b 100644
--- a/code/datums/components/singularity.dm
+++ b/code/datums/components/singularity.dm
@@ -323,7 +323,7 @@
var/turf/spawned_turf = get_turf(parent)
message_admins("A singulo has been created at [ADMIN_VERBOSEJMP(spawned_turf)].")
var/atom/atom_parent = parent
- atom_parent.investigate_log("was made a singularity at [AREACOORD(spawned_turf)].", INVESTIGATE_SINGULO)
+ atom_parent.investigate_log("was made a singularity at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE)
/// Fired when the singularity is fired at with the BSA and deletes it
/datum/component/singularity/proc/bluespace_reaction()
@@ -332,7 +332,7 @@
return
var/atom/atom_parent = parent
- atom_parent.investigate_log("has been shot by bluespace artillery and destroyed.", INVESTIGATE_SINGULO)
+ atom_parent.investigate_log("has been shot by bluespace artillery and destroyed.", INVESTIGATE_ENGINE)
qdel(parent)
#undef CHANCE_TO_MOVE_TO_TARGET
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index 90a30db3176..464fa7ef202 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -203,10 +203,10 @@
var/mob/user = throwingdatum.thrower
log_combat(throwingdatum?.thrower, hit_atom, "consumed", src)
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)], thrown by [key_name_admin(user)].")
- investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", INVESTIGATE_ENGINE)
else
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)] via throw impact.")
- investigate_log("has consumed [key_name(victim)] via throw impact.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [key_name(victim)] via throw impact.", INVESTIGATE_ENGINE)
victim.visible_message(span_danger("As [victim] is hit by [src], both flash into dust and silence fills the room..."),\
span_userdanger("You're hit by [src] and everything suddenly goes silent.\n[src] flashes into dust, and soon as you can register this, you do as well."),\
span_hear("Everything suddenly goes silent."))
@@ -321,11 +321,11 @@
return
victim.dust()
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)].")
- investigate_log("has consumed [key_name(victim)].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [key_name(victim)].", INVESTIGATE_ENGINE)
else if(istype(AM, /obj/singularity))
return
else
- investigate_log("has consumed [AM].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [AM].", INVESTIGATE_ENGINE)
qdel(AM)
if (user)
log_combat(user, AM, "consumed", sliver, "via [src]")
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index e983dfea9c6..31c7f3dbf11 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -16,6 +16,7 @@
INVESTIGATE_BOTANY,
INVESTIGATE_CARGO,
INVESTIGATE_CRAFTING,
+ INVESTIGATE_ENGINE,
INVESTIGATE_EXONET,
INVESTIGATE_EXPERIMENTOR,
INVESTIGATE_GRAVITY,
@@ -26,8 +27,6 @@
INVESTIGATE_RADIATION,
INVESTIGATE_RECORDS,
INVESTIGATE_RESEARCH,
- INVESTIGATE_SINGULO,
- INVESTIGATE_SUPERMATTER,
INVESTIGATE_TELESCI,
INVESTIGATE_WIRES,
)
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
index ef385a5aaa9..0b8b6f75441 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
@@ -232,7 +232,7 @@
var/obj/creation = new path(get_step(src, SOUTH))
creation.name = "[quality_control] [creation.name]"
if(selected_recipe.dangerous)
- investigate_log("has been created in the crystallizer.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been created in the crystallizer.", INVESTIGATE_ENGINE)
message_admins("[src] has been created in the crystallizer [ADMIN_JMP(src)].")
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3e27ec54dd4..48b9fdf8ca0 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -402,7 +402,7 @@
///Logs, gibs and returns point values of whatever mob is unfortunate enough to get eaten.
/mob/living/singularity_act()
- investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up!
+ investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_ENGINE) //Oh that's where the clown ended up!
gib()
return 20
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 39152ac9c83..2714c491bd1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -125,9 +125,9 @@
/obj/machinery/power/emitter/Destroy()
if(SSticker.IsRoundInProgress())
var/turf/T = get_turf(src)
- message_admins("Emitter deleted at [ADMIN_VERBOSEJMP(T)]")
- log_game("Emitter deleted at [AREACOORD(T)]")
- investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_SINGULO)
+ message_admins("[src] deleted at [ADMIN_VERBOSEJMP(T)]")
+ log_game("[src] deleted at [AREACOORD(T)]")
+ investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_ENGINE)
QDEL_NULL(sparks)
return ..()
@@ -158,9 +158,9 @@
fire_delay = maximum_fire_delay
to_chat(user, span_notice("You turn [active ? "on" : "off"] [src]."))
- message_admins("Emitter turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
- log_game("Emitter turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
- investigate_log("turned [active ? "ON" : "OFF"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+ message_admins("[src] turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
+ log_game("[src] turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
+ investigate_log("turned [active ? "ON" : "OFF"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
update_appearance()
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/user, list/modifiers)
@@ -189,15 +189,15 @@
if(powered)
powered = FALSE
update_appearance()
- investigate_log("lost power and turned OFF at [AREACOORD(src)]", INVESTIGATE_SINGULO)
- log_game("Emitter lost power in [AREACOORD(src)]")
+ investigate_log("lost power and turned OFF at [AREACOORD(src)]", INVESTIGATE_ENGINE)
+ log_game("[src] lost power in [AREACOORD(src)]")
return
add_load(active_power_usage)
if(!powered)
powered = TRUE
update_appearance()
- investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+ investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_ENGINE)
if(charge <= 80)
charge += 2.5 * delta_time
if(!check_delay() || manual == TRUE)
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index fb4cf70dc9e..b0d65bbe757 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -95,7 +95,7 @@ no power level overlay is currently in the overlays list.
span_notice("You turn on [src]."),
span_hear("You hear heavy droning."))
turn_on()
- investigate_log("activated by [key_name(user)].", INVESTIGATE_SINGULO)
+ investigate_log("activated by [key_name(user)].", INVESTIGATE_ENGINE)
add_fingerprint(user)
@@ -237,7 +237,7 @@ no power level overlay is currently in the overlays list.
else
visible_message(span_danger("The [name] shuts down!"), span_hear("You hear something shutting down."))
turn_off()
- investigate_log("ran out of power and deactivated", INVESTIGATE_SINGULO)
+ investigate_log("ran out of power and DEACTIVATED.", INVESTIGATE_ENGINE)
power = 0
check_power_level()
return FALSE
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 16253e11401..5636cac5203 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -137,7 +137,7 @@
switch(severity)
if(EXPLODE_DEVASTATE)
if(current_size <= STAGE_TWO)
- investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_SINGULO)
+ investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_ENGINE)
qdel(src)
return
@@ -257,7 +257,7 @@
resolved_singularity.singularity_size = current_size
if(current_size == allowed_size)
- investigate_log("grew to size [current_size]", INVESTIGATE_SINGULO)
+ investigate_log("grew to size [current_size].", INVESTIGATE_ENGINE)
return TRUE
else if(current_size < (--temp_allowed_size))
expand(temp_allowed_size)
@@ -266,7 +266,7 @@
/obj/singularity/proc/check_energy()
if(energy <= 0)
- investigate_log("collapsed.", INVESTIGATE_SINGULO)
+ investigate_log("collapsed.", INVESTIGATE_ENGINE)
qdel(src)
return FALSE
switch(energy)//Some of these numbers might need to be changed up later -Mport
@@ -430,7 +430,7 @@
/obj/singularity/singularity_act()
var/gain = (energy/2)
var/dist = max((current_size - 2),1)
- investigate_log("has been destroyed by another singularity.", INVESTIGATE_SINGULO)
+ investigate_log("has been destroyed by another singularity.", INVESTIGATE_ENGINE)
explosion(
src,
devastation_range = dist,
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 54500a352ee..a34e3e73fd8 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -152,7 +152,7 @@
if(default_deconstruction_crowbar(I))
message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
log_game("[src] has been deconstructed by [key_name(user)] at [AREACOORD(src)]")
- investigate_log("SMES deconstructed by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+ investigate_log("deconstructed by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
return
else if(panel_open && I.tool_behaviour == TOOL_CROWBAR)
return
@@ -181,9 +181,9 @@
/obj/machinery/power/smes/Destroy()
if(SSticker.IsRoundInProgress())
var/turf/T = get_turf(src)
- message_admins("SMES deleted at [ADMIN_VERBOSEJMP(T)]")
- log_game("SMES deleted at [AREACOORD(T)]")
- investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_SINGULO)
+ message_admins("[src] deleted at [ADMIN_VERBOSEJMP(T)]")
+ log_game("[src] deleted at [AREACOORD(T)]")
+ investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_ENGINE)
if(terminal)
disconnect_terminal()
return ..()
@@ -265,7 +265,7 @@
if(output_used < 0.0001) // either from no charge or set to 0
outputting = FALSE
- investigate_log("lost power and turned off", INVESTIGATE_SINGULO)
+ investigate_log("lost power and turned off", INVESTIGATE_ENGINE)
else if(output_attempt && charge > output_level && output_level > 0)
outputting = TRUE
else
@@ -388,8 +388,7 @@
log_smes(usr)
/obj/machinery/power/smes/proc/log_smes(mob/user)
- investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_SINGULO)
-
+ investigate_log("Input/Output: [input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"ON":"OFF"] | Input-mode: [input_attempt?"AUTO":"OFF"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_ENGINE)
/obj/machinery/power/smes/emp_act(severity)
. = ..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index fd97e038c07..a0ed5e9c5d0 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -261,7 +261,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
radio.keyslot = new radio_key
radio.set_listening(FALSE)
radio.recalculateChannels()
- investigate_log("has been created.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been created.", INVESTIGATE_ENGINE)
if(is_main_engine)
GLOB.main_supermatter_engine = src
@@ -286,7 +286,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
update_constants()
/obj/machinery/power/supermatter_crystal/Destroy()
- investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been destroyed.", INVESTIGATE_ENGINE)
SSair.stop_processing_machine(src)
QDEL_NULL(radio)
QDEL_NULL(countdown)
@@ -462,14 +462,14 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(combined_gas > MOLE_PENALTY_THRESHOLD)
- investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has collapsed into a singularity.", INVESTIGATE_ENGINE)
if(local_turf) //If something fucks up we blow anyhow. This fix is 4 years old and none ever said why it's here. help.
var/obj/singularity/created_singularity = new(local_turf)
created_singularity.energy = 800
created_singularity.consume(src)
return //No boom for me sir
if(power > POWER_PENALTY_THRESHOLD)
- investigate_log("has spawned additional energy balls.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has spawned additional energy balls.", INVESTIGATE_ENGINE)
if(local_turf)
var/obj/energy_ball/created_tesla = new(local_turf)
created_tesla.energy = 200 //Gets us about 9 balls
diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm
index 3abf284b520..e3683efb376 100644
--- a/code/modules/power/supermatter/supermatter_hit_procs.dm
+++ b/code/modules/power/supermatter/supermatter_hit_procs.dm
@@ -16,7 +16,7 @@
if(!istype(local_turf))
return FALSE
if(!istype(projectile.firer, /obj/machinery/power/emitter) && power_changes)
- investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_ENGINE)
if(projectile.armor_flag != BULLET || kiss_power)
if(kiss_power)
psyCoeff = 1
@@ -24,7 +24,7 @@
if(power_changes) //This needs to be here I swear
power += projectile.damage * bullet_energy + kiss_power
if(!has_been_powered)
- investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been powered for the first time.", INVESTIGATE_ENGINE)
message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
has_been_powered = TRUE
else if(takes_damage)
@@ -35,7 +35,7 @@
/obj/machinery/power/supermatter_crystal/singularity_act()
var/gain = 100
- investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SINGULO)
+ investigate_log("consumed by singularity.", INVESTIGATE_ENGINE)
message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
visible_message(span_userdanger("[src] is consumed by the singularity!"))
for(var/mob/hearing_mob as anything in GLOB.player_list)
@@ -159,7 +159,7 @@
if(!cause)
cause = "contact"
nom.visible_message(vis_msg, mob_msg, span_hear("You hear an unearthly noise as a wave of heat washes over you."))
- investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_ENGINE)
add_memory_in_range(src, 7, MEMORY_SUPERMATTER_DUSTED, list(DETAIL_PROTAGONIST = nom, DETAIL_WHAT_BY = src), story_value = STORY_VALUE_OKAY, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
Consume(nom)
@@ -214,7 +214,7 @@
user.visible_message(span_danger("As [user] touches \the [src] with \a [item], silence fills the room..."),\
span_userdanger("You touch \the [src] with \the [item], and everything suddenly goes silent.\n\The [item] flashes into dust as you flinch away from \the [src]."),\
span_hear("Everything suddenly goes silent."))
- investigate_log("has been attacked ([item]) by [key_name(user)]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been attacked ([item]) by [key_name(user)]", INVESTIGATE_ENGINE)
Consume(item)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
@@ -257,7 +257,7 @@
if(consumed_mob.status_flags & GODMODE)
return
message_admins("[src] has consumed [key_name_admin(consumed_mob)] [ADMIN_JMP(src)].")
- investigate_log("has consumed [key_name(consumed_mob)].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [key_name(consumed_mob)].", INVESTIGATE_ENGINE)
consumed_mob.dust(force = TRUE)
if(power_changes)
matter_power += 200
@@ -272,7 +272,7 @@
if(consumed_object.fingerprintslast)
suspicion = "last touched by [consumed_object.fingerprintslast]"
message_admins("[src] has consumed [consumed_object], [suspicion] [ADMIN_JMP(src)].")
- investigate_log("has consumed [consumed_object] - [suspicion].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has consumed [consumed_object] - [suspicion].", INVESTIGATE_ENGINE)
qdel(consumed_object)
if(!iseffect(consumed_object) && power_changes)
matter_power += 200
@@ -280,7 +280,7 @@
//Some poor sod got eaten, go ahead and irradiate people nearby.
radiation_pulse(src, max_range = 6, threshold = 0.3, chance = 30)
for(var/mob/living/near_mob in range(10))
- investigate_log("has irradiated [key_name(near_mob)] after consuming [consumed_object].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has irradiated [key_name(near_mob)] after consuming [consumed_object].", INVESTIGATE_ENGINE)
if (HAS_TRAIT(near_mob, TRAIT_RADIMMUNE) || issilicon(near_mob))
continue
if(ishuman(near_mob) && SSradiation.wearing_rad_protected_clothing(near_mob))
diff --git a/code/modules/power/supermatter/supermatter_process.dm b/code/modules/power/supermatter/supermatter_process.dm
index 1285c9c059d..3dfc5e0027f 100644
--- a/code/modules/power/supermatter/supermatter_process.dm
+++ b/code/modules/power/supermatter/supermatter_process.dm
@@ -389,7 +389,7 @@
SEND_SIGNAL(src, COMSIG_SUPERMATTER_DELAM_ALARM)
lastwarning = REALTIMEOFDAY
if(!has_reached_emergency)
- investigate_log("has reached the emergency point for the first time.", INVESTIGATE_SUPERMATTER)
+ investigate_log("has reached the emergency point for the first time.", INVESTIGATE_ENGINE)
message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].")
has_reached_emergency = TRUE
else if(damage >= damage_archived) // The damage is still going up
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index d25cb645c78..e2f2f8b1b63 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -50,7 +50,7 @@
var/turf/spawned_turf = get_turf(src)
message_admins("A tesla has been created at [ADMIN_VERBOSEJMP(spawned_turf)].")
- investigate_log("(tesla) was created at [AREACOORD(spawned_turf)].", INVESTIGATE_SINGULO)
+ investigate_log("was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE)
/obj/energy_ball/Destroy()
if(orbiting && istype(orbiting.parent, /obj/energy_ball))