diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 581a3e45a9f..60efd7aff52 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -195,7 +195,7 @@ /// Logging define for ID card access changes #define LOG_ID_ACCESS_CHANGE(user, id_card, change_description) \ log_game("[key_name(user)] [change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]"); \ - user.investigate_log("([key_name(user)]) [change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", INVESTIGATE_ACCESSCHANGES); \ + user.investigate_log("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", INVESTIGATE_ACCESSCHANGES); \ user.log_message("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", LOG_GAME); \ /// Displayed name for Common ID card accesses. diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index ceefa55c090..44d6b18b3c6 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -449,7 +449,7 @@ else result.forceMove(user.drop_location()) to_chat(user, span_notice("[crafting_recipe.name] constructed.")) - user.investigate_log("[key_name(user)] crafted [crafting_recipe]", INVESTIGATE_CRAFTING) + user.investigate_log("crafted [crafting_recipe]", INVESTIGATE_CRAFTING) crafting_recipe.on_craft_completion(user, result) else to_chat(user, span_warning("Construction failed[result]")) diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index c7e30b9e0b0..f0c35785358 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_ENGINE) + atom_parent.investigate_log("was made into 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() diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 149d88ecf65..f3e7c256753 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -831,7 +831,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(elligible_organs.len) var/obj/item/organ/O = pick(elligible_organs) O.Remove(src) - visible_message(span_danger("[src] vomits up their [O.name]!"), span_danger("You vomit up your [O.name]")) //no "vomit up your heart" + visible_message(span_danger("[src] vomits up [p_their()] [O.name]!"), span_danger("You vomit up your [O.name]")) //no "vomit up your heart" O.forceMove(drop_location()) if(prob(20)) O.animate_atom_living() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index fb83ef1abf2..780355d8966 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -267,7 +267,7 @@ temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" else if(href_list["del_all2"]) - investigate_log("[key_name(usr)] has deleted all medical records.", INVESTIGATE_RECORDS) + usr.investigate_log("has deleted all medical records.", INVESTIGATE_RECORDS) GLOB.data_core.medical.Cut() temp = "All records deleted." @@ -435,7 +435,7 @@ temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" else if(href_list["del_r2"]) - investigate_log("[key_name(usr)] has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS) + usr.investigate_log("has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS) if(active2) qdel(active2) active2 = null diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 1fb8a9cbf6d..c7ff56e17a5 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -75,7 +75,6 @@ /obj/item/circuit_component/arrest_console_data/input_received(datum/port/input/port) - if(!attached_console || !attached_console.authenticated) on_fail.set_output(COMPONENT_SIGNAL) return @@ -148,7 +147,6 @@ on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) /obj/item/circuit_component/arrest_console_arrest/input_received(datum/port/input/port) - if(!attached_console || !attached_console.authenticated) on_fail.set_output(COMPONENT_SIGNAL) return @@ -936,14 +934,14 @@ What a mess.*/ var/mob/living/carbon/human/H = i H.sec_hud_set_security_status() if("Delete Record (Security) Execute") - investigate_log("[key_name(usr)] has deleted the security records for [active1.fields["name"]].", INVESTIGATE_RECORDS) + usr.investigate_log("has deleted the security records for [active1.fields["name"]].", INVESTIGATE_RECORDS) if(active2) qdel(active2) active2 = null if("Delete Record (ALL) Execute") if(active1) - investigate_log("[key_name(usr)] has deleted all records for [active1.fields["name"]].", INVESTIGATE_RECORDS) + usr.investigate_log("has deleted all records for [active1.fields["name"]].", INVESTIGATE_RECORDS) for(var/datum/data/record/R in GLOB.data_core.medical) if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) qdel(R) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index f836a3413b2..6c147027931 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -225,20 +225,20 @@ if("time") var/value = text2num(params["adjust"]) if(value) - . = set_timer(time_left()+value) - investigate_log("[key_name(usr)] modified the timer by [value/10] seconds for cell [id], currently [time_left(seconds = TRUE)]", INVESTIGATE_RECORDS) + . = set_timer(time_left() + value) + user.investigate_log("modified the timer by [value/10] seconds for cell [id], currently [time_left(seconds = TRUE)]", INVESTIGATE_RECORDS) user.log_message("modified the timer by [value/10] seconds for cell [id], currently [time_left(seconds = TRUE)]", LOG_ATTACK) if("start") timer_start() - investigate_log("[key_name(usr)] has started [id]'s timer of [time_left(seconds = TRUE)] seconds", INVESTIGATE_RECORDS) + user.investigate_log("has started [id]'s timer of [time_left(seconds = TRUE)] seconds", INVESTIGATE_RECORDS) user.log_message("has started [id]'s timer of [time_left(seconds = TRUE)] seconds", LOG_ATTACK) if("stop") - investigate_log("[key_name(usr)] has stopped [id]'s timer of [time_left(seconds = TRUE)] seconds", INVESTIGATE_RECORDS) - user.log_message("[key_name(usr)] has stopped [id]'s timer of [time_left(seconds = TRUE)] seconds", LOG_ATTACK) + user.investigate_log("has stopped [id]'s timer of [time_left(seconds = TRUE)] seconds", INVESTIGATE_RECORDS) + user.log_message("has stopped [id]'s timer of [time_left(seconds = TRUE)] seconds", LOG_ATTACK) timer_end(forced = TRUE) if("flash") - investigate_log("[key_name(usr)] has flashed cell [id]", INVESTIGATE_RECORDS) - user.log_message("[key_name(usr)] has flashed cell [id]", LOG_ATTACK) + user.investigate_log("has flashed cell [id]", INVESTIGATE_RECORDS) + user.log_message("has flashed cell [id]", LOG_ATTACK) for(var/datum/weakref/flash_ref as anything in flashers) var/obj/machinery/flasher/flasher = flash_ref.resolve() if(!flasher) @@ -256,7 +256,7 @@ if("long") preset_time = PRESET_LONG . = set_timer(preset_time) - investigate_log("[key_name(usr)] set cell [id]'s timer to [preset_time/10] seconds", INVESTIGATE_RECORDS) + user.investigate_log("set cell [id]'s timer to [preset_time/10] seconds", INVESTIGATE_RECORDS) user.log_message("set cell [id]'s timer to [preset_time/10] seconds", LOG_ATTACK) if(timing) activation_time = world.time diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 3a869669ad0..14e15daa860 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/obj/item/I = new contains_type(get_turf(M)) if (!QDELETED(I)) //might contain something like metal rods that might merge with a stack on the ground M.visible_message(span_notice("[M] unwraps \the [src], finding \a [I] inside!")) - I.investigate_log("([I.type]) was found in a present by [key_name(M)].", INVESTIGATE_PRESENTS) + M.investigate_log("has unwrapped a present containing [I.type].", INVESTIGATE_PRESENTS) M.put_in_hands(I) I.add_fingerprint(M) else diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 235d2e4d7df..53f024a0415 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -402,7 +402,7 @@ // Use up the material use(recipe.req_amount * multiplier) - builder.investigate_log("[key_name(builder)] crafted [recipe.title]", INVESTIGATE_CRAFTING) + builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING) // Apply mat datums if(recipe.applies_mats && LAZYLEN(mats_per_unit)) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 98da67c862b..5cab0d0301e 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -2,7 +2,13 @@ if(!message || !subject) return var/F = file("[GLOB.log_directory]/[subject].html") - WRITE_FILE(F, "[time_stamp()] [REF(src)] ([x],[y],[z]) || [src] [message]
") + var/source = "[src]" + + if(isliving(src)) + var/mob/living/source_mob = src + source += " ([source_mob.ckey ? source_mob.ckey : "*no key*"])" + + WRITE_FILE(F, "[time_stamp()] [REF(src)] ([x],[y],[z]) || [source] [message]
") /client/proc/investigate_show() set name = "Investigate" diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 1266b0ad76e..9d145f05baa 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -359,14 +359,14 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) var/new_pressure = clamp(text2num(params["value"]), 0, ATMOS_PUMP_MAX_PRESSURE) vent.internal_pressure_bound = new_pressure if (old_pressure != new_pressure) - vent.investigate_log(" internal pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) + vent.investigate_log("internal pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) if ("reset_internal_pressure") if (isnull(vent)) return TRUE if (vent.internal_pressure_bound != 0) vent.internal_pressure_bound = 0 - vent.investigate_log(" internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) + vent.investigate_log("internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) if ("set_external_pressure") if (isnull(vent)) return TRUE @@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return TRUE vent.external_pressure_bound = new_pressure - vent.investigate_log(" external pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) + vent.investigate_log("external pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) vent.update_appearance(UPDATE_ICON) if ("reset_external_pressure") if (isnull(vent)) @@ -388,7 +388,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return TRUE vent.external_pressure_bound = ATMOS_PUMP_MAX_PRESSURE - vent.investigate_log(" internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) + vent.investigate_log("internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) vent.update_appearance(UPDATE_ICON) if ("scrubbing") if (isnull(scrubber)) @@ -424,7 +424,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) tlv.vars[name] = -1 else tlv.vars[name] = round(value, 0.01) - investigate_log(" treshold value for [env]:[name] was set to [value] by [key_name(usr)]",INVESTIGATE_ATMOS) + investigate_log("threshold value for [env]:[name] was set to [value] by [key_name(usr)]",INVESTIGATE_ATMOS) var/turf/our_turf = get_turf(src) var/datum/gas_mixture/environment = our_turf.return_air() check_air_dangerlevel(our_turf, environment, environment.temperature) diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index a01167de625..ec34d3d9a0a 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -157,7 +157,7 @@ else change = "removed" var/gas_name = GLOB.meta_gas_info[gas_id2path(params["val"])][META_GAS_NAME] - investigate_log("[key_name(usr)] [change] [gas_name] from the filter type.", INVESTIGATE_ATMOS) + usr.investigate_log("[change] [gas_name] from the filter type.", INVESTIGATE_ATMOS) . = TRUE update_appearance() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 77a12cd4eeb..6b50acb37f3 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -200,7 +200,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/proc/set_scrubbing(scrubbing, mob/user) src.scrubbing = scrubbing - investigate_log(" was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [isnull(user) ? "the game" : key_name(user)]", INVESTIGATE_ATMOS) + investigate_log("was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [isnull(user) ? "the game" : key_name(user)]", INVESTIGATE_ATMOS) update_appearance(UPDATE_ICON) try_update_atmos_process() update_power_usage() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 3f2e521d471..27bd8f2a8a3 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -551,9 +551,9 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) if(close_valve) valve_open = FALSE update_appearance() - investigate_log("Valve was closed by [key_name(user)].", INVESTIGATE_ATMOS) + investigate_log("valve was closed by [key_name(user)].", INVESTIGATE_ATMOS) else if(valve_open && holding) - investigate_log("[key_name(user)] started a transfer into [holding].", INVESTIGATE_ATMOS) + user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) /obj/machinery/portable_atmospherics/canister/process(delta_time) @@ -727,7 +727,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) if(danger) //sent to admin's chat if contains dangerous gases message_admins(admin_msg) else - logmsg = "Valve was closed by [key_name(usr)], stopping the transfer into \the [holding || "air"].
" + logmsg = "valve was closed by [key_name(usr)], stopping the transfer into \the [holding || "air"].
" investigate_log(logmsg, INVESTIGATE_ATMOS) release_log += logmsg . = TRUE @@ -753,7 +753,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) if(holding) if(valve_open) message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].") - investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) + usr.investigate_log("removed the [holding], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) replace_tank(usr, FALSE) . = TRUE @@ -761,7 +761,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) shielding_powered = !shielding_powered SSair.start_processing_machine(src) message_admins("[ADMIN_LOOKUPFLW(usr)] turned [shielding_powered ? "on" : "off"] the [src] powered shielding.") - investigate_log("[key_name(usr)] turned [shielding_powered ? "on" : "off"] the [src] powered shielding.") + usr.investigate_log("turned [shielding_powered ? "on" : "off"] the [src] powered shielding.") . = TRUE if("reaction_suppression") if(!nob_crystal_inserted) @@ -770,7 +770,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) suppress_reactions = !suppress_reactions SSair.start_processing_machine(src) message_admins("[ADMIN_LOOKUPFLW(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") - investigate_log("[key_name(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") + usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") . = TRUE update_appearance() diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index f446ec8f149..db6b8fd2c97 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -89,7 +89,7 @@ on = FALSE update_appearance() else if(on && holding && direction == PUMP_OUT) - investigate_log("[key_name(user)] started a transfer into [holding].", INVESTIGATE_ATMOS) + usr.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) /obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -135,14 +135,14 @@ message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]") log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]") else if(on && direction == PUMP_OUT) - investigate_log("[key_name(usr)] started a transfer into [holding].", INVESTIGATE_ATMOS) + usr.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) . = TRUE if("direction") if(direction == PUMP_OUT) direction = PUMP_IN else if(on && holding) - investigate_log("[key_name(usr)] started a transfer into [holding].", INVESTIGATE_ATMOS) + usr.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) direction = PUMP_OUT . = TRUE if("pressure") @@ -173,7 +173,7 @@ suppress_reactions = !suppress_reactions SSair.start_processing_machine(src) message_admins("[ADMIN_LOOKUPFLW(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") - investigate_log("[key_name(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") + usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") . = TRUE update_appearance() diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 6298887b3d9..4540b38c40b 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -140,7 +140,7 @@ on = FALSE update_appearance() else if(on && holding) - investigate_log("[key_name(user)] started a transfer into [holding].", INVESTIGATE_ATMOS) + usr.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) /obj/machinery/portable_atmospherics/scrubber/ui_act(action, params) . = ..() @@ -166,7 +166,7 @@ suppress_reactions = !suppress_reactions SSair.start_processing_machine(src) message_admins("[ADMIN_LOOKUPFLW(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") - investigate_log("[key_name(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") + usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.") . = TRUE update_appearance() diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 0fd848764bf..3a8e0fe1e10 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -178,9 +178,9 @@ SSshuttle.supply.export_categories = get_export_categories() SSshuttle.moveShuttle(cargo_shuttle, docking_away, TRUE) say("The supply shuttle is departing.") - investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO) + usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO) else - investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO) + usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) . = TRUE @@ -199,7 +199,7 @@ else SSshuttle.shuttle_loan.loan_shuttle() say("The supply shuttle has been loaned to CentCom.") - investigate_log("[key_name(usr)] accepted a shuttle loan event.", INVESTIGATE_CARGO) + usr.investigate_log("accepted a shuttle loan event.", INVESTIGATE_CARGO) usr.log_message("accepted a shuttle loan event.", LOG_GAME) . = TRUE if("add") diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 51c1a96c904..c784604de65 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) SSblackbox.ReportDeath(src) log_message("has died (BRUTE: [src.getBruteLoss()], BURN: [src.getFireLoss()], TOX: [src.getToxLoss()], OXY: [src.getOxyLoss()], CLONE: [src.getCloneLoss()])", LOG_ATTACK) if(key) // Prevents log spamming of keyless mob deaths (like xenobio monkeys) - investigate_log("([key]) has died at [loc_name(src)].
\ + investigate_log("has died at [loc_name(src)].
\ BRUTE: [src.getBruteLoss()] BURN: [src.getFireLoss()] TOX: [src.getToxLoss()] OXY: [src.getOxyLoss()] CLONE: [src.getCloneLoss()] STAM: [src.getStaminaLoss()]
\ Brain damage: [src.getOrganLoss(ORGAN_SLOT_BRAIN) || "0"]
\ Blood volume: [src.blood_volume]cl ([round((src.blood_volume / BLOOD_VOLUME_NORMAL) * 100, 0.1)]%)
\ diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 29b0a6e6f37..0818d64fa48 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -259,7 +259,7 @@ return if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) return - investigate_log("[key_name(src)] has been set from [target_record.fields["criminal"]] to [setcriminal] by [key_name(human_user)].", INVESTIGATE_RECORDS) + investigate_log("has been set from [target_record.fields["criminal"]] to [setcriminal] by [key_name(human_user)].", INVESTIGATE_RECORDS) target_record.fields["criminal"] = setcriminal sec_hud_set_security_status() return diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 9deb24cad1b..5470697f26f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -405,8 +405,8 @@ ///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_ENGINE) //Oh that's where the clown ended up! - investigate_log("has been gibbed by the singularity.", INVESTIGATE_DEATHS) + usr.investigate_log("has been consumed by the singularity.", INVESTIGATE_ENGINE) //Oh that's where the clown ended up! + usr.investigate_log("has been gibbed by the singularity.", INVESTIGATE_DEATHS) gib() return 20 @@ -435,7 +435,7 @@ if(4) new /mob/living/simple_animal/hostile/construct/proteon/hostile(get_turf(src)) spawn_dust() - investigate_log("has been gibbed by Nar'Sie.", INVESTIGATE_DEATHS) + usr.investigate_log("has been gibbed by Nar'Sie.", INVESTIGATE_DEATHS) gib() return TRUE diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 9aee5f05582..0a64f267c1a 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -160,9 +160,9 @@ SSshuttle.supply.export_categories = get_export_categories() SSshuttle.moveShuttle(cargo_shuttle, docking_away, TRUE) computer.say("The supply shuttle is departing.") - computer.investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO) + usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO) else - computer.investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO) + usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) computer.say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) . = TRUE @@ -181,7 +181,7 @@ else SSshuttle.shuttle_loan.loan_shuttle() computer.say("The supply shuttle has been loaned to CentCom.") - computer.investigate_log("[key_name(usr)] accepted a shuttle loan event.", INVESTIGATE_CARGO) + usr.investigate_log("accepted a shuttle loan event.", INVESTIGATE_CARGO) usr.log_message("accepted a shuttle loan event.", LOG_GAME) . = TRUE if("add") diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm index b8c0d0b1a66..7bf3a579d0e 100644 --- a/code/modules/modular_computers/file_system/programs/techweb.dm +++ b/code/modules/modular_computers/file_system/programs/techweb.dm @@ -199,7 +199,7 @@ return FALSE var/list/price = tech_node.get_price(stored_research) if(stored_research.can_afford(price)) - computer.investigate_log("[key_name(user)] researched [id]([json_encode(price)]) on techweb id [stored_research.id] via [computer].", INVESTIGATE_RESEARCH) + user.investigate_log("researched [id]([json_encode(price)]) on techweb id [stored_research.id] via [computer].", INVESTIGATE_RESEARCH) if(stored_research == SSresearch.science_tech) SSblackbox.record_feedback("associative", "science_techweb_unlock", 1, list("id" = "[id]", "name" = tech_node.display_name, "price" = "[json_encode(price)]", "time" = SQLtime())) if(stored_research.research_node_id(id)) diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm index 70fcedf92fc..9a3d4f224b2 100644 --- a/code/modules/power/supermatter/supermatter_hit_procs.dm +++ b/code/modules/power/supermatter/supermatter_hit_procs.dm @@ -50,7 +50,7 @@ /obj/machinery/power/supermatter_crystal/singularity_act() var/gain = 100 - investigate_log("consumed by singularity.", INVESTIGATE_ENGINE) + investigate_log("was consumed by a 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!")) var/turf/sm_turf = get_turf(src) @@ -109,7 +109,7 @@ if(do_after(user, 3 SECONDS, src)) message_admins("[ADMIN_LOOKUPFLW(user)] attached [destabilizing_crystal] to the supermatter at [ADMIN_VERBOSEJMP(src)].") user.log_message("attached [destabilizing_crystal] to the supermatter", LOG_GAME) - investigate_log("[key_name(user)] attached [destabilizing_crystal] to a supermatter crystal.", INVESTIGATE_ENGINE) + user.investigate_log("attached [destabilizing_crystal] to a supermatter crystal.", INVESTIGATE_ENGINE) to_chat(user, span_danger("\The [destabilizing_crystal] snaps onto \the [src].")) set_delam(SM_DELAM_PRIO_IN_GAME, /datum/sm_delam/cascade) external_damage_immediate += 100 diff --git a/code/modules/research/anomaly/anomaly_refinery.dm b/code/modules/research/anomaly/anomaly_refinery.dm index 21370f92695..b3e45f8f2a4 100644 --- a/code/modules/research/anomaly/anomaly_refinery.dm +++ b/code/modules/research/anomaly/anomaly_refinery.dm @@ -168,8 +168,8 @@ * Triggered by attempting to operate an emagged anomaly refinery. */ /obj/machinery/research/anomaly_refinery/proc/error_test() - message_admins("[src] was emagged and ejected a TTV") - investigate_log("was emagged and ejected a TTV", INVESTIGATE_RESEARCH) + message_admins("[src] was emagged and ejected a TTV.") + investigate_log("was emagged and ejected a TTV.", INVESTIGATE_RESEARCH) obj_flags &= ~EMAGGED say("Issue resolved. Have a nice day!") diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index f672df1b461..dd436c7c729 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -218,7 +218,7 @@ /obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist, notify_admins) if(notify_admins) - investigate_log("[key_name(usr)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH) + usr.investigate_log("built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH) message_admins("[ADMIN_LOOKUPFLW(usr)] has built [amount] of [path] at \a [src]([type]).") for(var/i in 1 to amount) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 64187c547df..d1d825d3937 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -105,7 +105,7 @@ Nothing else in the console has ID requirements. return FALSE var/list/price = TN.get_price(stored_research) if(stored_research.can_afford(price)) - investigate_log("[key_name(user)] researched [id]([json_encode(price)]) on techweb id [stored_research.id].", INVESTIGATE_RESEARCH) + user.investigate_log("researched [id]([json_encode(price)]) on techweb id [stored_research.id].", INVESTIGATE_RESEARCH) if(stored_research == SSresearch.science_tech) SSblackbox.record_feedback("associative", "science_techweb_unlock", 1, list("id" = "[id]", "name" = TN.display_name, "price" = "[json_encode(price)]", "time" = SQLtime())) if(stored_research.research_node_id(id)) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index b5d245e7b60..1b1b3900c75 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -34,7 +34,7 @@ All ShuttleMove procs go here M.visible_message(span_warning("[shuttle] slams into [M]!")) SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type) log_shuttle("[key_name(M)] was shuttle gibbed by [shuttle].") - investigate_log("has been gibbed by [shuttle].", INVESTIGATE_DEATHS) + M.investigate_log("has been gibbed by [shuttle].", INVESTIGATE_DEATHS) M.gib() diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 7f74bdac973..400a4204d74 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( SSeconomy.export_total += (D.account_balance - presale_points) SSshuttle.centcom_message = msg - investigate_log("Shuttle contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO) + investigate_log("contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO) /* Generates a box of mail depending on our exports and imports. diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm index 24ad39a9bf5..b716b658486 100644 --- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm @@ -121,7 +121,7 @@ if(LAZYLEN(target.butcher_results) || LAZYLEN(target.guaranteed_butcher_results)) SEND_SIGNAL(src, COMSIG_MECHA_DRILL_MOB, chassis, target) else - investigate_log("has been gibbed by [src] (attached to [chassis]).", INVESTIGATE_DEATHS) + target.investigate_log("has been gibbed by [src] (attached to [chassis]).", INVESTIGATE_DEATHS) target.gib() else //drill makes a hole