diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm new file mode 100644 index 0000000000000..859f3e37756c0 --- /dev/null +++ b/code/__DEFINES/logging.dm @@ -0,0 +1,18 @@ +//Investigate logging defines +#define INVESTIGATE_ATMOS "atmos" +#define INVESTIGATE_BOTANY "botany" +#define INVESTIGATE_CARGO "cargo" +#define INVESTIGATE_EXPERIMENTOR "experimentor" +#define INVESTIGATE_GRAVITY "gravity" +#define INVESTIGATE_RECORDS "records" +#define INVESTIGATE_SINGULO "singulo" +#define INVESTIGATE_SUPERMATTER "supermatter" +#define INVESTIGATE_TELESCI "telesci" +#define INVESTIGATE_WIRES "wires" + +//Individual logging defines +#define INDIVIDUAL_ATTACK_LOG "Attack log" +#define INDIVIDUAL_SAY_LOG "Say log" +#define INDIVIDUAL_EMOTE_LOG "Emote log" +#define INDIVIDUAL_OOC_LOG "OOC log" +#define INDIVIDUAL_SHOW_ALL_LOG "All logs" \ No newline at end of file diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 49e03bdbdf298..2d36d72ee3c05 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -114,13 +114,6 @@ #define SNPC_MARTYR 3 #define SNPC_PSYCHO 4 -//Individual logging defines -#define INDIVIDUAL_ATTACK_LOG "Attack log" -#define INDIVIDUAL_SAY_LOG "Say log" -#define INDIVIDUAL_EMOTE_LOG "Emote log" -#define INDIVIDUAL_OOC_LOG "OOC log" -#define INDIVIDUAL_SHOW_ALL_LOG "All logs" - #define TK_MAXRANGE 15 #define NO_SLIP_WHEN_WALKING 1 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 38f44a41f5e37..6911a05fb9c13 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -292,7 +292,7 @@ src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) else if(href_list["del_all2"]) - investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", "records") + investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", INVESTIGATE_RECORDS) GLOB.data_core.medical.Cut() src.temp = "All records deleted." @@ -458,7 +458,7 @@ src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) else if(href_list["del_r2"]) - investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records") + investigate_log("[usr.name] ([usr.key]) 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 ef669cfd025e7..33947ba4db84d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -452,7 +452,7 @@ What a mess.*/ temp += "No" if("Purge All Records") - investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records") + investigate_log("[usr.name] ([usr.key]) has purged all the security records.", INVESTIGATE_RECORDS) for(var/datum/data/record/R in GLOB.data_core.security) qdel(R) GLOB.data_core.security.Cut() @@ -696,18 +696,18 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" - investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records") + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS) for(var/mob/living/carbon/human/H in GLOB.mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system H.sec_hud_set_security_status() if("Delete Record (Security) Execute") - investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") + investigate_log("[usr.name] ([usr.key]) 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("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") + investigate_log("[usr.name] ([usr.key]) 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/launch_pad.dm b/code/game/machinery/launch_pad.dm index 82e9d9a176231..6c3d25d223fd4 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -143,7 +143,7 @@ else log_msg += "nothing" log_msg += " [sending ? "to" : "from"] [target_x], [target_y], [z] ([A ? A.name : "null area"])" - investigate_log(log_msg.Join(), "telesci") + investigate_log(log_msg.Join(), INVESTIGATE_TELESCI) updateDialog() //Starts in the briefcase. Don't spawn this directly, or it will runtime when closing. diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 4e39c53b14b0f..73d270f9bbb2b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -69,7 +69,7 @@ var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [name]?", "Proceed", "Abort") if(safety == "Abort" || !in_range(src, user) || !src || !W || user.incapacitated()) return - investigate_log("has become a singularity. Caused by [user.key]","singulo") + investigate_log("has become a singularity. Caused by [user.key]", INVESTIGATE_SINGULO) to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") qdel(W) var/obj/singularity/singulo = new /obj/singularity (get_turf(src)) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 02c223e507423..0e91b3c0f129d 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -5,7 +5,7 @@ F << "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
" -/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "botany") ) +/client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY) ) set name = "Investigate" set category = "Admin" if(!holder) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index a4c0641be099b..ddabc541d5c07 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -152,7 +152,7 @@ Pipelines + Other Objects -> Pipe network "[user] unfastens \the [src].", \ "You unfasten \the [src].", \ "You hear ratchet.") - investigate_log("was REMOVED by [key_name(usr)]", "atmos") + investigate_log("was REMOVED by [key_name(usr)]", INVESTIGATE_ATMOS) //You unwrenched a pipe full of pressure? Let's splat you into the wall, silly. if(unsafe_wrenching) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index e67db7fcd71e3..8ea2b34251448 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -112,7 +112,7 @@ Passive gate is similar to the regular pump except: 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"] @@ -128,7 +128,7 @@ Passive gate is similar to the regular pump except: . = 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/passive_gate/atmosinit() @@ -152,7 +152,7 @@ Passive gate is similar to the regular pump except: target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos") + investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) if("status" in signal.data) broadcast_status() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 9307f1ec23100..3b1c6b2fa8a02 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -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() @@ -159,7 +159,7 @@ Thus, the two variables affect pump operation are set in New(): target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos") + investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) if("status" in signal.data) broadcast_status() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 95baa790bdeed..ffcd91fc306e9 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -30,12 +30,12 @@ It's like a regular ol' straight pipe, but you can turn it on and off. update_parents() var/datum/pipeline/parent1 = PARENT1 parent1.reconcile_air() - investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") + investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) /obj/machinery/atmospherics/components/binary/valve/proc/close() open = 0 update_icon_nopipes() - investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", "atmos") + investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) /obj/machinery/atmospherics/components/binary/valve/proc/normalize_dir() if(dir==SOUTH) 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 750ffbdedf725..4013159b3b15a 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -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) @@ -155,7 +155,7 @@ Thus, the two variables affect pump operation are set in New(): transfer_rate = Clamp(text2num(signal.data["set_transfer_rate"]),0,air1.volume) if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos") + investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) if("status" in signal.data) broadcast_status() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index 4b9c2c710f136..3c6c7b2342b30 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -83,20 +83,20 @@ if(!removed) return - + var/filtering = filter_type ? TRUE : FALSE - + if(filtering && !istext(filter_type)) WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]") filtering = FALSE - + if(filtering && removed.gases[filter_type]) var/datum/gas_mixture/filtered_out = new - + filtered_out.temperature = removed.temperature filtered_out.assert_gas(filter_type) filtered_out.gases[filter_type][MOLES] = removed.gases[filter_type][MOLES] - + removed.gases[filter_type][MOLES] = 0 removed.garbage_collect() @@ -133,7 +133,7 @@ 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"] @@ -149,7 +149,7 @@ . = 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) if("filter") filter_type = "" var/filter_name = "nothing" @@ -157,6 +157,6 @@ if(gas in GLOB.meta_gas_info) filter_type = gas filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] - investigate_log("was set to filter [filter_name] by [key_name(usr)]", "atmos") + investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE update_icon() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index ed168c7153d08..958782d5a151c 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -138,7 +138,7 @@ 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"] @@ -154,17 +154,17 @@ . = 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) if("node1") var/value = text2num(params["concentration"]) node1_concentration = max(0, min(1, node1_concentration + value)) node2_concentration = max(0, min(1, node2_concentration - value)) - investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", "atmos") + investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE if("node2") var/value = text2num(params["concentration"]) node2_concentration = max(0, min(1, node2_concentration + value)) node1_concentration = max(0, min(1, node1_concentration - value)) - investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", "atmos") + investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE update_icon() \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index ca90604ee71b6..a03a6952c42a0 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -167,7 +167,7 @@ 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"] @@ -183,7 +183,7 @@ . = TRUE if(.) volume_rate = Clamp(rate, 0, MAX_TRANSFER_RATE) - investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", "atmos") + investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) update_icon() broadcast_status() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 8761211f7251a..26f02a43ef24b 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -173,7 +173,7 @@ if("power") on = !on use_power = 1 + 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("target") var/target = params["target"] @@ -190,7 +190,7 @@ . = TRUE if(.) target_temperature = Clamp(target, min_temperature, max_temperature) - investigate_log("was set to [target_temperature] K by [key_name(usr)]", "atmos") + investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/freezer diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index e1305fb7b2589..efd5c53a60a81 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -286,7 +286,7 @@ density = 0 playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) update_icon() - investigate_log("was destroyed.", "atmos") + investigate_log("was destroyed.", INVESTIGATE_ATMOS) if(holding) holding.forceMove(T) @@ -388,7 +388,7 @@ . = TRUE if(.) release_pressure = Clamp(round(pressure), can_min_release_pressure, can_max_release_pressure) - investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", "atmos") + investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS) if("valve") var/logmsg valve_open = !valve_open @@ -439,7 +439,7 @@ if("eject") if(holding) if(valve_open) - investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transfering into the air
", "atmos") + investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transfering into the air
", INVESTIGATE_ATMOS) holding.forceMove(get_turf(src)) holding = null . = TRUE diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 793ff6528c68c..458da2511ae47 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -120,6 +120,6 @@ if(I.force < 10 && !(stat & BROKEN)) take_damage(0) else - investigate_log("was smacked with \a [I] by [key_name(user)].", "atmos") + investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) add_fingerprint(user) ..() diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 376e907ab649a..a34940ce30143 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -133,7 +133,7 @@ . = TRUE if(.) pump.target_pressure = Clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE) - investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", "atmos") + investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS) if("eject") if(holding) holding.loc = get_turf(src) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index e097cd6e7ebb1..cc415b42d22ee 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -8,7 +8,7 @@ var/safety_warning = "For safety reasons the automated supply shuttle \ cannot transport live organisms, classified nuclear weaponry or \ homing beacons." - + light_color = "#E2853D"//orange /obj/machinery/computer/cargo/request @@ -106,9 +106,9 @@ SSshuttle.supply.contraband = contraband SSshuttle.moveShuttle("supply", "supply_away", TRUE) say("The supply shuttle has departed.") - investigate_log("[key_name(usr)] sent the supply shuttle away.", "cargo") + investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO) else - investigate_log("[key_name(usr)] called the supply shuttle.", "cargo") + investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO) say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") SSshuttle.moveShuttle("supply", "supply_home", TRUE) . = TRUE diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index 60ff69a323c7e..45269743a5d0f 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -37,7 +37,7 @@ return FALSE to_chat(user, "You plant [src].") message_admins("Kudzu planted by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(user)]",0,1) - investigate_log("was planted by [key_name(user)] at [COORD(user)]","botany") + investigate_log("was planted by [key_name(user)] at [COORD(user)]", INVESTIGATE_BOTANY) new /datum/spacevine_controller(get_turf(user), mutations, potency, production) qdel(src) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index d12f9c52cf0e2..61eb397b92beb 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -307,5 +307,5 @@ . = ..() if(.) message_admins("Shadowshroom planted by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(user)]",0,1) - investigate_log("was planted by [key_name(user)] at [COORD(user)]", "botany") + investigate_log("was planted by [key_name(user)] at [COORD(user)]", INVESTIGATE_BOTANY) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 760ad4ba7ff84..6206f7f2f41bb 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -411,7 +411,7 @@ if(R) if(H.canUseHUD()) if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security)) - investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", "records") + investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS) R.fields["criminal"] = setcriminal sec_hud_set_security_status() return diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 18023eb724a0a..df97b0aa31591 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -622,7 +622,7 @@ gain = 100 if(mind.assigned_role == "Clown") gain = rand(-300, 300) - investigate_log("([key_name(src)]) has been consumed by the singularity.","singulo") //Oh that's where the clown ended up! + investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up! gib() return(gain) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index feec3dd246f79..2494f04138456 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -291,7 +291,7 @@ /mob/living/singularity_act() var/gain = 20 - investigate_log("([key_name(src)]) has been consumed by the singularity.","singulo") //Oh that's where the clown ended up! + investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up! gib() return(gain) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index d160d69daa765..526f7dbbfd714 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -131,7 +131,7 @@ By design, d1 is the smallest direction and d2 is the highest return user.visible_message("[user] cuts the cable.", "You cut the cable.") stored.add_fingerprint(user) - investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires") + investigate_log("was cut by [key_name(usr, usr.client)] in [get_area(T)]", INVESTIGATE_WIRES) deconstruct() return diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index cf6d2fb61c3d3..b3577756f0700 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne var/broken_state = 0 /obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts. - investigate_log("was destroyed!", "gravity") + investigate_log("was destroyed!", INVESTIGATE_GRAVITY) on = 0 update_list() for(var/obj/machinery/gravity_generator/part/O in parts) @@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne breaker = 0 set_power() set_state(0) - investigate_log("has broken down.", "gravity") + investigate_log("has broken down.", INVESTIGATE_GRAVITY) /obj/machinery/gravity_generator/main/set_fix() ..() @@ -263,7 +263,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne if(href_list["gentoggle"]) breaker = !breaker - investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") + investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", INVESTIGATE_GRAVITY) set_power() src.updateUsrDialog() @@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/power_change() ..() - investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", "gravity") + investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY) set_power() /obj/machinery/gravity_generator/main/get_status() @@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne new_state = 1 charging_state = new_state ? POWER_UP : POWER_DOWN // Startup sequence animation. - investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", "gravity") + investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", INVESTIGATE_GRAVITY) update_icon() // Set the state of the gravity. @@ -308,12 +308,12 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne if(on) // If we turned on and the game is live. if(gravity_in_level() == 0) alert = 1 - investigate_log("was brought online and is now producing gravity for this level.", "gravity") + investigate_log("was brought online and is now producing gravity for this level.", INVESTIGATE_GRAVITY) message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]") else if(gravity_in_level() == 1) alert = 1 - investigate_log("was brought offline and there is now no gravity for this level.", "gravity") + investigate_log("was brought offline and there is now no gravity for this level.", INVESTIGATE_GRAVITY) message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]") update_icon() diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 9fc4f668c9c88..8611b6093f112 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(rad_collectors) /obj/machinery/power/rad_collector/process() if(loaded_tank) if(!loaded_tank.air_contents.gases["plasma"]) - investigate_log("out of fuel.","singulo") + investigate_log("out of fuel.", INVESTIGATE_SINGULO) eject() else loaded_tank.air_contents.gases["plasma"][MOLES] -= 0.001*drainratio @@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(rad_collectors) "You turn the [src.name] [active? "on":"off"].") var/fuel = loaded_tank.air_contents.gases["plasma"] fuel = fuel ? fuel[MOLES] : 0 - investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].","singulo") + investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO) return else to_chat(user, "The controls are locked!") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index c1ff1ee9ce0d0..5e9bc107a7197 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -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("deleted at [get_area(src)] [COORD(T)]","singulo") + investigate_log("deleted at [get_area(src)] [COORD(T)]", INVESTIGATE_SINGULO) QDEL_NULL(sparks) return ..() @@ -124,13 +124,13 @@ to_chat(user, "You turn off \the [src].") message_admins("Emitter turned off by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1) log_game("Emitter turned off by [key_name(user)] in [COORD(src)]") - investigate_log("turned off by [key_name(user)] at [get_area(src)]","singulo") + investigate_log("turned off by [key_name(user)] at [get_area(src)]", INVESTIGATE_SINGULO) else src.active = 1 to_chat(user, "You turn on \the [src].") src.shot_number = 0 src.fire_delay = maximum_fire_delay - investigate_log("turned on by [key_name(user)] at [get_area(src)]","singulo") + investigate_log("turned on by [key_name(user)] at [get_area(src)]", INVESTIGATE_SINGULO) update_icon() else to_chat(user, "The controls are locked!") @@ -171,12 +171,12 @@ if(!powered) powered = 1 update_icon() - investigate_log("regained power and turned on at [get_area(src)]","singulo") + investigate_log("regained power and turned on at [get_area(src)]", INVESTIGATE_SINGULO) else if(powered) powered = 0 update_icon() - investigate_log("lost power and turned off at [get_area(src)]","singulo") + investigate_log("lost power and turned off at [get_area(src)]", INVESTIGATE_SINGULO) log_game("Emitter lost power in ([x],[y],[z])") return if(charge <=80) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 602359c089861..2ebd2c6b07c04 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -71,7 +71,7 @@ field_generator power level display "You turn on the [name].", \ "You hear heavy droning.") turn_on() - investigate_log("activated by [user.key].","singulo") + investigate_log("activated by [user.key].", INVESTIGATE_SINGULO) add_fingerprint(user) else @@ -197,7 +197,7 @@ field_generator power level display else visible_message("The [name] shuts down!", "You hear something shutting down.") turn_off() - investigate_log("ran out of power and deactivated","singulo") + investigate_log("ran out of power and deactivated", INVESTIGATE_SINGULO) power = 0 check_power_level() return 0 @@ -324,7 +324,7 @@ field_generator power level display if((world.time - O.last_warning) > 50) //to stop message-spam temp = 0 message_admins("A singulo exists and a containment field has failed.",1) - investigate_log("has failed whilst a singulo exists.","singulo") + investigate_log("has failed whilst a singulo exists.", INVESTIGATE_SINGULO) O.last_warning = world.time /obj/machinery/field/generator/shock(mob/living/user) diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm index 8d375e06f90fc..38ce154d01378 100644 --- a/code/modules/power/singularity/investigate.dm +++ b/code/modules/power/singularity/investigate.dm @@ -1,4 +1,4 @@ /area/engine/engineering/poweralert(state, source) if (state != poweralm) - investigate_log("has a power alarm!","singulo") + investigate_log("has a power alarm!", INVESTIGATE_SINGULO) ..() \ No newline at end of file diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 3c0356044fbfd..b43bf3da0d520 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -156,7 +156,7 @@ ..() if(master && master.active) master.toggle_power() - investigate_log("was moved whilst active; it powered down.","singulo") + investigate_log("was moved whilst active; it powered down.", INVESTIGATE_SINGULO) /obj/structure/particle_accelerator/update_icon() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 2045cb380cb07..5a3de3a540965 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -119,7 +119,7 @@ message_admins("PA Control Computer increased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1) log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [COORD(src)]") - investigate_log("increased to [strength] by [key_name(usr)]","singulo") + investigate_log("increased to [strength] by [key_name(usr)]", INVESTIGATE_SINGULO) /obj/machinery/particle_accelerator/control_box/proc/remove_strength(s) @@ -129,7 +129,7 @@ message_admins("PA Control Computer decreased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1) log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [COORD(src)]") - investigate_log("decreased to [strength] by [key_name(usr)]","singulo") + investigate_log("decreased to [strength] by [key_name(usr)]", INVESTIGATE_SINGULO) /obj/machinery/particle_accelerator/control_box/power_change() @@ -144,7 +144,7 @@ if(active) //a part is missing! if(connected_parts.len < 6) - investigate_log("lost a connected part; It powered down.","singulo") + investigate_log("lost a connected part; It powered down.", INVESTIGATE_SINGULO) toggle_power() update_icon() return @@ -204,7 +204,7 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power() active = !active - investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"]","singulo") + investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"]", INVESTIGATE_SINGULO) message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])") if(active) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 1a308ed471231..56fc6c4985635 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -86,7 +86,7 @@ switch(severity) if(1) if(current_size <= STAGE_TWO) - investigate_log("has been destroyed by a heavy explosion.","singulo") + investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_SINGULO) qdel(src) return else @@ -134,7 +134,7 @@ var/count = locate(/obj/machinery/field/containment) in urange(30, src, 1) if(!count) message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1) - investigate_log("was created. [count?"":"No containment fields were active"]","singulo") + investigate_log("was created. [count?"":"No containment fields were active"]", INVESTIGATE_SINGULO) /obj/singularity/proc/dissipate() if(!dissipate) @@ -219,7 +219,7 @@ consume_range = 5 dissipate = 0 if(current_size == allowed_size) - investigate_log("grew to size [current_size]","singulo") + investigate_log("grew to size [current_size]", INVESTIGATE_SINGULO) return 1 else if(current_size < (--temp_allowed_size)) expand(temp_allowed_size) @@ -229,7 +229,7 @@ /obj/singularity/proc/check_energy() if(energy <= 0) - investigate_log("collapsed.","singulo") + investigate_log("collapsed.", INVESTIGATE_SINGULO) qdel(src) return 0 switch(energy)//Some of these numbers might need to be changed up later -Mport diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 276a581cb370e..81d231cad9bce 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -172,7 +172,7 @@ if(default_deconstruction_crowbar(I)) message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1) log_game("[src] has been deconstructed by [key_name(user)]") - investigate_log("SMES deconstructed by [key_name(user)]","singulo") + investigate_log("SMES deconstructed by [key_name(user)]", INVESTIGATE_SINGULO) return else if(panel_open && istype(I, /obj/item/weapon/crowbar)) return @@ -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("deleted at [A][COORD(T)]","singulo") + investigate_log("deleted at [A][COORD(T)]", INVESTIGATE_SINGULO) if(terminal) disconnect_terminal() return ..() @@ -285,7 +285,7 @@ if(output_used < 0.0001) // either from no charge or set to 0 outputting = 0 - investigate_log("lost power and turned off","singulo") + investigate_log("lost power and turned off", INVESTIGATE_SINGULO) else if(output_attempt && charge > output_level && output_level > 0) outputting = 1 else @@ -420,7 +420,7 @@ log_smes(usr.ckey) /obj/machinery/power/smes/proc/log_smes(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]", "singulo") + 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]", INVESTIGATE_SINGULO) /obj/machinery/power/smes/emp_act(severity) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 866041d8837ce..dea263231acbf 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -137,11 +137,11 @@ radio.keyslot = new radio_key radio.listening = 0 radio.recalculateChannels() - investigate_log("has been created.", "supermatter") + investigate_log("has been created.", INVESTIGATE_SUPERMATTER) /obj/machinery/power/supermatter_shard/Destroy() - investigate_log("has been destroyed.", "supermatter") + investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER) SSair.atmos_machinery -= src QDEL_NULL(radio) GLOB.poi_list -= src @@ -171,16 +171,16 @@ M << 'sound/magic/Charge.ogg' to_chat(M, "You feel reality distort for a moment...") if(combined_gas > MOLE_PENALTY_THRESHOLD) - investigate_log("has collapsed into a singularity.", "supermatter") + investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER) if(T) var/obj/singularity/S = new(T) S.energy = 800 S.consume(src) else - investigate_log("has exploded.", "supermatter") + investigate_log("has exploded.", INVESTIGATE_SUPERMATTER) explosion(get_turf(T), explosion_power * max(gasmix_power_ratio, 0.205) * 0.5 , explosion_power * max(gasmix_power_ratio, 0.205) + 2, explosion_power * max(gasmix_power_ratio, 0.205) + 4 , explosion_power * max(gasmix_power_ratio, 0.205) + 6, 1, 1) if(power > POWER_PENALTY_THRESHOLD) - investigate_log("has spawned additional energy balls.", "supermatter") + investigate_log("has spawned additional energy balls.", INVESTIGATE_SUPERMATTER) var/obj/singularity/energy_ball/E = new(T) E.energy = power qdel(src) @@ -345,7 +345,7 @@ radio.talk_into(src, "[emergency_alert] Instability: [stability]%", common_channel, get_spans(), get_default_language()) lastwarning = REALTIMEOFDAY if(!has_reached_emergency) - investigate_log("has reached the emergency point for the first time.", "supermatter") + investigate_log("has reached the emergency point for the first time.", INVESTIGATE_SUPERMATTER) message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].") has_reached_emergency = 1 else if(damage >= damage_archived) // The damage is still going up @@ -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) @@ -401,7 +401,7 @@ /obj/machinery/power/supermatter_shard/singularity_act() var/gain = 100 - investigate_log("Supermatter shard consumed by singularity.","singulo") + investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SINGULO) message_admins("Singularity has consumed a supermatter shard and can now become stage six.") visible_message("[src] is consumed by the singularity!") for(var/mob/M in GLOB.mob_list) @@ -450,7 +450,7 @@ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... [user.p_their()] body starts to glow and bursts into flames before flashing into ash.",\ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ "You hear an unearthly noise as a wave of heat washes over you.") - investigate_log("has been attacked (hand) by [user]", "supermatter") + investigate_log("has been attacked (hand) by [user]", INVESTIGATE_SUPERMATTER) playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) Consume(user) @@ -467,7 +467,7 @@ user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\ "You touch \the [src] with \the [W], and everything suddenly goes silent.\n\The [W] flashes into dust as you flinch away from \the [src].",\ "Everything suddenly goes silent.") - investigate_log("has been attacked ([W]) by [user]", "supermatter") + investigate_log("has been attacked ([W]) by [user]", INVESTIGATE_SUPERMATTER) Consume(W) playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) @@ -493,13 +493,13 @@ if(isliving(AM)) var/mob/living/user = AM message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") - investigate_log("has consumed [key_name(user)].", "supermatter") + investigate_log("has consumed [key_name(user)].", INVESTIGATE_SUPERMATTER) user.dust() matter_power += 200 else if(istype(AM, /obj/singularity)) return else if(isobj(AM) && !istype(AM, /obj/effect)) - investigate_log("has consumed [AM].", "supermatter") + investigate_log("has consumed [AM].", INVESTIGATE_SUPERMATTER) qdel(AM) matter_power += 200 @@ -507,7 +507,7 @@ //Some poor sod got eaten, go ahead and irradiate people nearby. radiation_pulse(get_turf(src), 4, 10, 500, 1) for(var/mob/living/L in range(10)) - investigate_log("has irradiated [L] after consuming [AM].", "supermatter") + investigate_log("has irradiated [L] after consuming [AM].", INVESTIGATE_SUPERMATTER) if(L in view()) L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ "The unearthly ringing subsides and you notice you have new radiation burns.", 2) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 47d6b52b44ca6..d34e6723cbcb4 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -238,7 +238,7 @@ visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!") for(var/mob/living/m in oview(1, src)) m.apply_damage(15, BRUTE, pick("head","chest","groin")) - investigate_log("Experimentor dealt minor brute to [m].", "experimentor") + investigate_log("Experimentor dealt minor brute to [m].", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) visible_message("[src] malfunctions!") @@ -248,7 +248,7 @@ var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) var/obj/item/throwing = loaded_item - investigate_log("Experimentor has thrown [loaded_item] at [target]", "experimentor") + investigate_log("Experimentor has thrown [loaded_item] at [target]", INVESTIGATE_EXPERIMENTOR) ejectItem() if(throwing) throwing.throw_at(target, 10, 1) @@ -259,7 +259,7 @@ visible_message("[exp_on] has activated an unknown subroutine!") cloneMode = TRUE cloneCount = badThingCoeff - investigate_log("Experimentor has made a clone of [exp_on]", "experimentor") + investigate_log("Experimentor has made a clone of [exp_on]", INVESTIGATE_EXPERIMENTOR) ejectItem() else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!") @@ -278,7 +278,7 @@ var/newPath = pickWeighted(valid_items) loaded_item = new newPath(src) visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!") - investigate_log("Experimentor has transformed [savedName] into [loaded_item]", "experimentor") + investigate_log("Experimentor has transformed [savedName] into [loaded_item]", INVESTIGATE_EXPERIMENTOR) if(istype(loaded_item,/obj/item/weapon/grenade/chem_grenade)) var/obj/item/weapon/grenade/chem_grenade/CG = loaded_item CG.prime() @@ -295,7 +295,7 @@ var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src R.add_reagent(chosenchem , 50) - investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor") + investigate_log("Experimentor has released [chosenchem] smoke.", INVESTIGATE_EXPERIMENTOR) var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, 0, src, silent = 1) playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) @@ -315,14 +315,14 @@ qdel(R) ejectItem(TRUE) warn_admins(usr, "[chosenchem] smoke") - investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor") + investigate_log("Experimentor has released [chosenchem] smoke!", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) visible_message("[src] malfunctions, spewing harmless gas.") throwSmoke(src.loc) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) visible_message("[src] melts [exp_on], ionizing the air around it!") empulse(src.loc, 4, 6) - investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor") + investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_HEAT) @@ -336,14 +336,14 @@ C.reagents.add_reagent(chosenchem , 50) C.name = "Cup of Suspicious Liquid" C.desc = "It has a large hazard symbol printed on the side in fading ink." - investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor") + investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) var/turf/start = get_turf(src) var/mob/M = locate(/mob/living) in view(src, 3) var/turf/MT = get_turf(M) if(MT) visible_message("[src] dangerously overheats, launching a flaming fuel orb!") - investigate_log("Experimentor has launched a fireball at [M]!", "experimentor") + investigate_log("Experimentor has launched a fireball at [M]!", INVESTIGATE_EXPERIMENTOR) var/obj/item/projectile/magic/aoe/fireball/FB = new /obj/item/projectile/magic/aoe/fireball(start) FB.original = MT FB.current = start @@ -353,7 +353,7 @@ else if(prob(EFFECT_PROB_LOW-badThingCoeff)) visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!") explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2) - investigate_log("Experimentor started a fire.", "experimentor") + investigate_log("Experimentor started a fire.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!") @@ -367,14 +367,14 @@ removed.temperature = min((removed.temperature*heat_capacity + 100000)/heat_capacity, 1000) env.merge(removed) air_update_turf() - investigate_log("Experimentor has released hot air.", "experimentor") + investigate_log("Experimentor has released hot air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) visible_message("[src] malfunctions, activating its emergency coolant systems!") throwSmoke(src.loc) for(var/mob/living/m in oview(1, src)) m.apply_damage(5, BURN, pick("head","chest","groin")) - investigate_log("Experimentor has dealt minor burn damage to [m]", "experimentor") + investigate_log("Experimentor has dealt minor burn damage to [m]", INVESTIGATE_EXPERIMENTOR) ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_COLD) @@ -388,13 +388,13 @@ C.reagents.add_reagent(chosenchem , 50) C.name = "Cup of Suspicious Liquid" C.desc = "It has a large hazard symbol printed on the side in fading ink." - investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor") + investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src R.add_reagent("frostoil" , 50) - investigate_log("Experimentor has released frostoil gas.", "experimentor") + investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR) var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, 0, src, silent = 1) playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) @@ -413,7 +413,7 @@ removed.temperature = (removed.temperature*heat_capacity - 75000)/heat_capacity env.merge(removed) air_update_turf() - investigate_log("Experimentor has released cold air.", "experimentor") + investigate_log("Experimentor has released cold air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!") @@ -433,14 +433,14 @@ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3) - investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor") + investigate_log("Experimentor has triggered the 'throw things' reaction.", INVESTIGATE_EXPERIMENTOR) for(var/atom/movable/AM in oview(7,src)) if(!AM.anchored) AM.throw_at(src,10,1) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) visible_message("[src]'s crusher goes one level too high, crushing right into space-time!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3) - investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor") + investigate_log("Experimentor has triggered the 'minor throw things' reaction.", INVESTIGATE_EXPERIMENTOR) var/list/throwAt = list() for(var/atom/movable/AM in oview(7,src)) if(!AM.anchored) @@ -460,7 +460,7 @@ playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1) var/obj/item/weapon/relic/R = loaded_item R.reveal() - investigate_log("Experimentor has revealed a relic with [R.realProc] effect.", "experimentor") + investigate_log("Experimentor has revealed a relic with [R.realProc] effect.", INVESTIGATE_EXPERIMENTOR) ejectItem() //Global reactions @@ -476,32 +476,32 @@ if(trackedIan) throwSmoke(trackedIan.loc) trackedIan.loc = src.loc - investigate_log("Experimentor has stolen Ian!", "experimentor") //...if anyone ever fixes it... + investigate_log("Experimentor has stolen Ian!", INVESTIGATE_EXPERIMENTOR) //...if anyone ever fixes it... else new /mob/living/simple_animal/pet/dog/corgi(src.loc) - investigate_log("Experimentor has spawned a new corgi.", "experimentor") + investigate_log("Experimentor has spawned a new corgi.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) if(globalMalf > 36 && globalMalf < 50) visible_message("Experimentor draws the life essence of those nearby!") for(var/mob/living/m in view(4,src)) to_chat(m, "You feel your flesh being torn from you, mists of blood drifting to [src]!") m.apply_damage(50, BRUTE, "chest") - investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor") + investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", INVESTIGATE_EXPERIMENTOR) if(globalMalf > 51 && globalMalf < 75) visible_message("[src] encounters a run-time error!") throwSmoke(src.loc) if(trackedRuntime) throwSmoke(trackedRuntime.loc) trackedRuntime.loc = src.loc - investigate_log("Experimentor has stolen Runtime!", "experimentor") + investigate_log("Experimentor has stolen Runtime!", INVESTIGATE_EXPERIMENTOR) else new /mob/living/simple_animal/pet/cat(src.loc) - investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", "experimentor") + investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) if(globalMalf > 76) visible_message("[src] begins to smoke and hiss, shaking violently!") use_power(500000) - investigate_log("Experimentor has drained power from its APC", "experimentor") + investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR) spawn(resetTime) icon_state = "h_lathe" diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5c182b3a88aec..8f79e1355650e 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -447,7 +447,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, for(var/i = 0, i