diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index 5e6ac3d348c..7164bf28072 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(GPS_list) gpstag = a . = TRUE - usr.log_message("renamed [parentasatom] to \"global positioning system ([gpstag])\".") + usr.log_message("renamed [parentasatom] to \"global positioning system ([gpstag])\".", LOG_GAME) parentasatom.name = "global positioning system ([gpstag])" if("power") diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 4628c4dd811..194f7c11676 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -114,7 +114,7 @@ auth_id = "\[NULL\]" if("toggle-logs") should_log = !should_log - operator.log_message("set the logs of [src] [should_log ? "On" : "Off"].") + operator.log_message("set the logs of [src] [should_log ? "On" : "Off"].", LOG_GAME) if("restore-console") restoring = TRUE addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9) @@ -136,7 +136,7 @@ APC.remote_control = src APC.ui_interact(operator) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) - operator.log_message("remotely accessed [APC] from [src].") + operator.log_message("remotely accessed [APC] from [src].", LOG_GAME) log_activity("[auth_id] remotely accessed APC in [get_area_name(APC.area, TRUE)]") if(APC.locked) APC.say("Remote access detected. Interface unlocked.") diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index 212fe263e9a..ba0cc0a400c 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -493,7 +493,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) if(obj_flags & EMAGGED) return to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.")) - user.log_message("emagged [src], activating Realism Mode.") + user.log_message("emagged [src], activating Realism Mode.", LOG_GAME) name = "The Orion Trail: Realism Edition" desc = "Learn how our ancestors got to Orion, and try not to die in the process!" newgame() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d940fdb0b70..20543d6dc69 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -329,7 +329,7 @@ var/destination = params["destination"] - usr.log_message("is about to send the following message to [destination]: [message]") + usr.log_message("is about to send the following message to [destination]: [message]", LOG_GAME) to_chat( GLOB.admins, span_adminnotice( \ diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 30fde7ea0eb..ad8503c9685 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -118,7 +118,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26) continue if(L.flash_act(affect_silicon = 1)) - L.log_message("was AOE flashed by an automated portable flasher",LOG_ATTACK) + L.log_message("was AOE flashed by an automated portable flasher", LOG_ATTACK) L.Paralyze(strength) flashed = TRUE diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index dba832bc7ba..dd30457dc46 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -433,13 +433,13 @@ span_notice("You turn off \the [src]."), \ span_hear("You hear heavy droning fade out.")) active = FALSE - user.log_message("deactivated [src].") + user.log_message("deactivated [src].", LOG_GAME) else user.visible_message(span_notice("[user] turned \the [src] on."), \ span_notice("You turn on \the [src]."), \ span_hear("You hear heavy droning.")) active = ACTIVE_SETUPFIELDS - user.log_message("activated [src].") + user.log_message("activated [src].", LOG_GAME) add_fingerprint(user) /obj/machinery/power/shieldwallgen/emag_act(mob/user) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index e65ab53dc21..6b3db65eded 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -370,7 +370,7 @@ var/policy = get_policy(ROLE_PYROCLASTIC_SLIME) if (policy) to_chat(S, policy) - S.log_message("was made into a slime by pyroclastic anomaly at [AREACOORD(T)].", LOG_GAME) + S.log_message("was made into a slime by pyroclastic anomaly", LOG_GAME) ///////////////////// diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 9389a278baf..36215ef5d99 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -87,7 +87,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit && M.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(M)] on fire with [src] at [AREACOORD(user)]") - user.log_message("set [key_name(M)] on fire with [src] at [AREACOORD(user)]", LOG_ATTACK) + user.log_message("set [key_name(M)] on fire with [src]", LOG_ATTACK) var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(!lit || !cig || user.combat_mode) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 04d5e49268c..869215ef5ed 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -123,7 +123,7 @@ span_notice("You activate \the [src]."), span_hear("You hear a click.")) message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(src)]") - user.log_message("activated a powersink at [AREACOORD(src)]", LOG_GAME) + user.log_message("activated a powersink", LOG_GAME) set_mode(OPERATING) if(OPERATING) @@ -131,7 +131,7 @@ "[user] deactivates \the [src]!", \ span_notice("You deactivate \the [src]."), span_hear("You hear a click.")) - user.log_message("deactivated the powersink at [AREACOORD(src)]", LOG_GAME) + user.log_message("deactivated the powersink", LOG_GAME) set_mode(CLAMPED_OFF) /// Removes internal heat and shares it with the atmosphere. diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 2daee9ddc0d..464d8df9ff4 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -199,7 +199,7 @@ GLOB.bombers += admin_bomb_message message_admins(admin_bomb_message) log_game("Bomb valve opened in [AREACOORD(bombturf)][attachment_message][bomber_message]") - bomber.log_message("opened bomb valve at [AREACOORD(bombturf)].", LOG_GAME, log_globally = FALSE) + bomber.log_message("opened bomb valve", LOG_GAME, log_globally = FALSE) valve_open = merge_gases(target, change_volume) diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 805b7b93b60..400b9898951 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -256,7 +256,7 @@ if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15)) owner.visible_message(span_danger("\The [attack_text] hits the fuel tank on [owner]'s [name], rupturing it! What a shot!")) var/turf/target_turf = get_turf(owner) - owner.log_message("held a flamethrower tank detonated by a projectile ([hitby]) at [COORD(target_turf)]", LOG_GAME) + owner.log_message("held a flamethrower tank detonated by a projectile ([hitby])", LOG_GAME) igniter.ignite_turf(src,target_turf, release_amount = 100) qdel(ptank) return 1 //It hit the flamethrower, not them diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index e039b2db34e..a94ce5ddae0 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -49,7 +49,7 @@ var/obj/effect/rune/target_rune = target if(target_rune.log_when_erased) - user.log_message("erased [target_rune.cultist_name] rune at [COORD(target_rune)] using a null rod", LOG_GAME) + user.log_message("erased [target_rune.cultist_name] rune using a null rod", LOG_GAME) message_admins("[ADMIN_LOOKUPFLW(user)] erased a [target_rune.cultist_name] rune with a null rod.") SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 7543a88d4ef..03b92b8fce4 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -160,7 +160,7 @@ for(var/iterator in 1 to goodie_count) var/target_good = pick_weight(goodies) var/atom/movable/target_atom = new target_good(src) - body.log_message("[key_name(body)] received [target_atom.name] in the mail ([target_good])", LOG_GAME) + body.log_message("received [target_atom.name] in the mail ([target_good])", LOG_GAME) return TRUE diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 3976cff3242..5166d66690c 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -156,8 +156,7 @@ user.visible_message(span_warning("[user] slides [grenade] into [src]."), \ span_danger("You slide [I] into [src].")) grenade = I - var/turf/grenade_turf = get_turf(src) - user.log_message("added a grenade ([I.name]) to [src] at [AREACOORD(grenade_turf)].", LOG_GAME) + user.log_message("added a grenade ([I.name]) to [src]", LOG_GAME) return if(istype(I, /obj/item/toy/plush)) love(I, user) diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index 6f0dac4a52c..7e683725634 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -331,7 +331,7 @@ audible_message("HUMAN HARM") playsound(get_turf(src), 'sound/ai/harmalarm.ogg', 70, 3) COOLDOWN_START(src, alarm_cooldown, HARM_ALARM_SAFETY_COOLDOWN) - user.log_message("used a Cyborg Harm Alarm in [AREACOORD(user)]", LOG_ATTACK) + user.log_message("used a Cyborg Harm Alarm", LOG_ATTACK) if(iscyborg(user)) var/mob/living/silicon/robot/robot_user = user to_chat(robot_user.connected_ai, "
[span_notice("NOTICE - Peacekeeping 'HARM ALARM' used by: [user]")]
") @@ -351,4 +351,4 @@ carbon.adjust_timed_status_effect(50 SECONDS, /datum/status_effect/jitter) playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3) COOLDOWN_START(src, alarm_cooldown, HARM_ALARM_NO_SAFETY_COOLDOWN) - user.log_message("used an emagged Cyborg Harm Alarm in [AREACOORD(user)]", LOG_ATTACK) + user.log_message("used an emagged Cyborg Harm Alarm", LOG_ATTACK) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index f6ba06adb3c..8223abf9c7c 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -310,8 +310,8 @@ forceMove(O) O.robot_suit = src - user.log_message("put the MMI/posibrain of [key_name(M.brainmob)] into a cyborg shell at [AREACOORD(src)]", LOG_GAME) - M.brainmob.log_message("was put into a cyborg shell at [AREACOORD(src)] by [key_name(user)]", LOG_GAME, log_globally = FALSE) + user.log_message("put the MMI/posibrain of [key_name(M.brainmob)] into a cyborg shell", LOG_GAME) + M.brainmob.log_message("was put into a cyborg shell by [key_name(user)]", LOG_GAME, log_globally = FALSE) if(!locomotion) O.set_lockcharge(TRUE) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 5acbc47e635..46ed75728ee 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -52,7 +52,7 @@ R.updatename() if(oldname == R.real_name) R.notify_ai(AI_NOTIFICATION_CYBORG_RENAMED, oldname, R.real_name) - usr.log_message("used a cyborg reclassification board to rename [oldkeyname] to [key_name(R)] at [loc_name(user)]", LOG_GAME) + usr.log_message("used a cyborg reclassification board to rename [oldkeyname] to [key_name(R)]", LOG_GAME) /obj/item/borg/upgrade/disablercooler name = "cyborg rapid disabler cooling module" diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 39765ed586e..fa666cba8dc 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -448,7 +448,7 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \ if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite var/turf/T = get_turf(src) message_admins("Coal ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") - user.log_message("ignited coal in in [AREACOORD(T)]", LOG_GAME) + user.log_message("ignited coal", LOG_GAME) fire_act(W.get_temperature()) return TRUE else diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 04e03651bfc..76e09084823 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -311,7 +311,7 @@ COOLDOWN_START(src, resin_cooldown, 10 SECONDS) R.remove_any(100) var/obj/effect/resin_container/resin = new (get_turf(src)) - user.log_message("used Resin Launcher at [AREACOORD(user)].", LOG_GAME) + user.log_message("used Resin Launcher", LOG_GAME) playsound(src,'sound/items/syringeproj.ogg',40,TRUE) var/delay = 2 var/datum/move_loop/loop = SSmove_manager.move_towards(resin, target, delay, timeout = delay * 5, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index cb3bfd42b6d..2f337741362 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -171,13 +171,13 @@ var/mob/living/attacked_mob = attacked_atom if(attacked_mob.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(attacked_mob)] on fire with [src] at [AREACOORD(user)].") - user.log_message("set [key_name(attacked_mob)] on fire with [src] at [AREACOORD(user)].", LOG_ATTACK) + user.log_message("set [key_name(attacked_mob)] on fire with [src]", LOG_ATTACK) /obj/item/weldingtool/attack_self(mob/user) if(src.reagents.has_reagent(/datum/reagent/toxin/plasma)) message_admins("[ADMIN_LOOKUPFLW(user)] activated a rigged welder at [AREACOORD(user)].") - user.log_message("activated a rigged welder at [AREACOORD(user)].", LOG_VICTIM) + user.log_message("activated a rigged welder", LOG_VICTIM) explode() switched_on(user) diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm index 5b147db5519..6c07551bc96 100644 --- a/code/game/objects/structures/cannons/cannon.dm +++ b/code/game/objects/structures/cannons/cannon.dm @@ -75,7 +75,7 @@ balloon_alert(user, "needs [reagents.maximum_volume]u of charge!") return visible_message(ignition_message) - user.log_message("fired a cannon in [AREACOORD(src)]", LOG_ATTACK) + user.log_message("fired a cannon", LOG_ATTACK) log_game("[key_name(user)] fired a cannon in [AREACOORD(src)]") addtimer(CALLBACK(src, .proc/fire), fire_delay) charge_ignited = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a2b5add5d7f..51ae3b32390 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -408,7 +408,7 @@ user.visible_message(span_notice("[user] [welded ? "welds shut" : "unwelded"] \the [src]."), span_notice("You [welded ? "weld" : "unwelded"] \the [src] with \the [W]."), span_hear("You hear welding.")) - user.log_message("[welded ? "welded":"unwelded"] closet [src] with [W] at [AREACOORD(src)]", LOG_GAME) + user.log_message("[welded ? "welded":"unwelded"] closet [src] with [W]", LOG_GAME) update_appearance() else if (can_install_electronics && istype(W, /obj/item/electronics/airlock)\ && !secure && !electronics && !locked && (welded || !can_weld_shut) && !broken) diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index cc79635e944..af175889f85 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -308,7 +308,7 @@ user.visible_message(span_notice("[user] [sinched ? null : "un"]sinches [src]."), span_notice("You [sinched ? null : "un"]sinch [src]."), span_hear("You hear stretching followed by metal clicking from [src].")) - user.log_message("[sinched ? "sinched":"unsinched"] secure environmental bag [src] at [AREACOORD(src)]", LOG_GAME) + user.log_message("[sinched ? "sinched":"unsinched"] secure environmental bag [src]", LOG_GAME) update_appearance() /obj/structure/closet/body_bag/environmental/prisoner/pressurized diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 12d6182b274..84d8485a648 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -177,7 +177,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) if(SHOWER_BOILING) current_temperature = SHOWER_NORMAL user.visible_message(span_notice("[user] adjusts the shower with \the [I]."), span_notice("You adjust the shower with \the [I] to [current_temperature] temperature.")) - user.log_message("has wrenched a shower at [AREACOORD(src)] to [current_temperature].", LOG_ATTACK) + user.log_message("has wrenched a shower to [current_temperature].", LOG_ATTACK) add_hiddenprint(user) handle_mist() return TRUE diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 480dd87a667..8fb1b382a5e 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -150,7 +150,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /obj/effect/statclick/ticket_list/Click() if (!usr.client?.holder) message_admins("[key_name_admin(usr)] non-holder clicked on a ticket list statclick! ([src])") - usr.log_message("[key_name(usr)] non-holder clicked on a ticket list statclick! ([src])", LOG_ADMIN) + usr.log_message("non-holder clicked on a ticket list statclick! ([src])", LOG_ADMIN) return GLOB.ahelp_tickets.BrowseTickets(current_state) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 37b9383c85c..3f346c253b8 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -482,7 +482,7 @@ return message_admins("[key_of_revenant] has been [old_key == key_of_revenant ? "re":""]made into a revenant by reforming ectoplasm.") - revenant.log_message("was [old_key == key_of_revenant ? "re":""]made as a revenant by reforming ectoplasm.") + revenant.log_message("was [old_key == key_of_revenant ? "re":""]made as a revenant by reforming ectoplasm.", LOG_GAME) visible_message(span_revenboldnotice("[src] suddenly rises into the air before fading away.")) revenant.essence = essence diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 1b5d1d67468..2a5a618ca2e 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -480,7 +480,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) var/turf/machine_turf = get_turf(to_explode) message_admins("[ADMIN_LOOKUPFLW(caller)] overloaded [to_explode.name] ([to_explode.type]) at [ADMIN_VERBOSEJMP(machine_turf)].") - caller.log_message("overloaded [to_explode.name] ([to_explode.type]) at [AREACOORD(machine_turf)].", LOG_ATTACK) + caller.log_message("overloaded [to_explode.name] ([to_explode.type])", LOG_ATTACK) explosion(to_explode, heavy_impact_range = 2, light_impact_range = 3) if(!QDELETED(to_explode)) //to check if the explosion killed it before we try to delete it qdel(to_explode) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 692e5719ee0..22dcb4838b5 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -148,7 +148,7 @@ if(user) log_combat(user, flashed, "[targeted? "flashed(targeted)" : "flashed(AOE)"]", src) else //caused by emp/remote signal - flashed.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]",LOG_ATTACK) + flashed.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]", LOG_ATTACK) if(generic_message && flashed != user) to_chat(flashed, span_danger("[src] emits a blinding light!")) @@ -380,7 +380,7 @@ if(user) log_combat(user, M, "[targeted? "hypno-flashed(targeted)" : "hypno-flashed(AOE)"]", src) else //caused by emp/remote signal - M.log_message("was [targeted? "hypno-flashed(targeted)" : "hypno-flashed(AOE)"]",LOG_ATTACK) + M.log_message("was [targeted? "hypno-flashed(targeted)" : "hypno-flashed(AOE)"]", LOG_ATTACK) if(generic_message && M != user) to_chat(M, span_notice("[src] emits a soothing light...")) if(targeted) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index e5b9acd5ab0..fb9b358d09b 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -219,7 +219,7 @@ if(!(obj_flags & EMAGGED)) obj_flags |= EMAGGED user.visible_message(span_warning("You emag [src], overwriting thermal regulator restrictions.")) - user.log_message("emagged [src] at [AREACOORD(src)], overwriting thermal regulator restrictions.", LOG_GAME) + user.log_message("emagged [src], overwriting thermal regulator restrictions.", LOG_GAME) playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) // update the HUD icon diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 14b6c72575c..717b994fa02 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -799,7 +799,7 @@ /obj/machinery/hydroponics/proc/mutatepest(mob/user) if(pestlevel > 5) message_admins("[ADMIN_LOOKUPFLW(user)] last altered a hydro tray's contents which spawned spiderlings.") - user.log_message("last altered a hydro tray, which spiderlings spawned from.") + user.log_message("last altered a hydro tray, which spiderlings spawned from.", LOG_GAME) visible_message(span_warning("The pests seem to behave oddly...")) spawn_atom_to_turf(/obj/structure/spider/spiderling/hunter, src, 3, FALSE) else if(myseed) diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index 6e895ce9425..94c722e737f 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -127,7 +127,7 @@ target.adjust_fire_stacks(round(our_seed.potency / 20)) if(target.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(target)] on fire with [our_plant] at [AREACOORD(user)]") - user.log_message("set [key_name(target)] on fire with [our_plant] at [AREACOORD(user)].", LOG_ATTACK) + user.log_message("set [key_name(target)] on fire with [our_plant]", LOG_ATTACK) target.log_message("was set on fire by [key_name(user)] with [our_plant].", LOG_VICTIM, log_globally = FALSE) our_plant.investigate_log("was used by [key_name(user)] to burn [key_name(target)] at [AREACOORD(user)]", INVESTIGATE_BOTANY) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index bb6958fc9b6..21bdc0cdc1d 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -107,7 +107,7 @@ SSblackbox.record_feedback("amount", "mmis_filled", 1) - user.log_message("has put the brain of [key_name(brainmob)] into an MMI at [AREACOORD(src)].", LOG_GAME) + user.log_message("has put the brain of [key_name(brainmob)] into an MMI", LOG_GAME) else if(brainmob) O.attack(brainmob, user) //Oh noooeeeee @@ -132,7 +132,7 @@ brainmob.emp_damage = 0 brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision brain.brainmob = brainmob //Set the brain to use the brainmob - user.log_message("has ejected the brain of [key_name(brainmob)] from an MMI at [AREACOORD(src)].", LOG_GAME) + user.log_message("has ejected the brain of [key_name(brainmob)] from an MMI", LOG_GAME) brainmob = null //Set mmi brainmob var to null brain.forceMove(drop_location()) if(Adjacent(user)) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 0ae0a6a2e71..7b46a7f455b 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -204,9 +204,8 @@ var/obj/item/bodypart/chest/LC = target.get_bodypart(BODY_ZONE_CHEST) if((!LC || IS_ORGANIC_LIMB(LC)) && !target.getorgan(/obj/item/organ/internal/body_egg/alien_embryo)) new /obj/item/organ/internal/body_egg/alien_embryo(target) - var/turf/T = get_turf(target) - target.log_message("was impregnated by a facehugger at [loc_name(T)].", LOG_GAME) - target.log_message("was impregnated by a facehugger at [loc_name(T)].", LOG_VICTIM, log_globally = FALSE) + target.log_message("was impregnated by a facehugger", LOG_GAME) + target.log_message("was impregnated by a facehugger", LOG_VICTIM, log_globally = FALSE) else target.visible_message(span_danger("[src] violates [target]'s face!"), \ diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 02541722a8b..9b19526aac1 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -907,14 +907,14 @@ Pass a positive integer as an argument to override a bot's default speed. bot_cover_flags |= (BOT_COVER_EMAGGED|BOT_COVER_HACKED|BOT_COVER_LOCKED) to_chat(usr, span_warning("You overload [src]'s [hackables].")) message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]") - usr.log_message("disabled safety lock of [src] in [AREACOORD(src)].", LOG_GAME) + usr.log_message("disabled safety lock of [src]", LOG_GAME) bot_reset() else if(!(bot_cover_flags & BOT_COVER_HACKED)) to_chat(usr, span_boldannounce("You fail to repair [src]'s [hackables].")) else bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) to_chat(usr, span_notice("You reset the [src]'s [hackables].")) - usr.log_message("re-enabled safety lock of [src] in [AREACOORD(src)].", LOG_GAME) + usr.log_message("re-enabled safety lock of [src]", LOG_GAME) bot_reset() if("eject_pai") if(paicard) diff --git a/code/modules/power/apc/apc_power_proc.dm b/code/modules/power/apc/apc_power_proc.dm index bdf77697533..9298ccb527c 100644 --- a/code/modules/power/apc/apc_power_proc.dm +++ b/code/modules/power/apc/apc_power_proc.dm @@ -39,7 +39,7 @@ return operating = !operating add_hiddenprint(user) - user.log_message("turned [operating ? "on" : "off"] the [src] in [AREACOORD(src)].", LOG_GAME) + user.log_message("turned [operating ? "on" : "off"] the [src]", LOG_GAME) update() update_appearance() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a8ad745d7aa..90eab523b87 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -178,8 +178,8 @@ return message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged/corrupted power cell explosion at [AREACOORD(T)].") - usr.log_message("has triggered a rigged/corrupted power cell explosion at [AREACOORD(T)].", LOG_GAME) - usr.log_message("has triggered a rigged/corrupted power cell explosion at [AREACOORD(T)].", LOG_VICTIM) + usr.log_message("triggered a rigged/corrupted power cell explosion", LOG_GAME) + usr.log_message("triggered a rigged/corrupted power cell explosion", LOG_VICTIM, log_globally = FALSE) //explosion(T, 0, 1, 2, 2) explosion(src, devastation_range = range_devastation, heavy_impact_range = range_heavy, light_impact_range = range_light, flash_range = range_flash) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 7e2e5abeaa5..42d45454800 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -152,7 +152,7 @@ var/turf/T = get_turf(src) if(default_deconstruction_crowbar(I)) message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)].") - user.log_message("deconstructed [src] at [AREACOORD(src)].", LOG_GAME) + user.log_message("deconstructed [src]", LOG_GAME) investigate_log("deconstructed by [key_name(user)] at [AREACOORD(src)].", INVESTIGATE_ENGINE) return else if(panel_open && I.tool_behaviour == TOOL_CROWBAR) diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm index a00c60e9fca..a413a1ab03f 100644 --- a/code/modules/power/supermatter/supermatter_hit_procs.dm +++ b/code/modules/power/supermatter/supermatter_hit_procs.dm @@ -99,7 +99,7 @@ to_chat(user, span_warning("You begin to attach \the [destabilizing_crystal] to \the [src]...")) 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 at [AREACOORD(src)].", LOG_GAME) + 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) to_chat(user, span_danger("\The [destabilizing_crystal] snaps onto \the [src].")) set_delam(SM_DELAM_PRIO_IN_GAME, /datum/sm_delam/cascade) diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index 1c262995570..c9c1f4f35ea 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -238,8 +238,8 @@ /obj/item/burner/attack(mob/living/carbon/M, mob/living/carbon/user) if(lit && M.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(M)] on fire with [src] at [AREACOORD(user)]") - user.log_message("set [key_name(M)] on fire with [src] at [AREACOORD(user)].", LOG_GAME) - M.log_message("was set on fire by [key_name(user)] with [src] at [AREACOORD(M)].", LOG_VICTIM) + user.log_message("set [key_name(M)] on fire with [src]", LOG_GAME) + M.log_message("was set on fire by [key_name(user)] with [src]", LOG_VICTIM, log_globally = FALSE) return ..() /obj/item/burner/process() diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index 0c3472d0e85..cfc8e9783e8 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -161,7 +161,7 @@ update_appearance() if(on) message_admins("[ADMIN_LOOKUPFLW(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_VERBOSEJMP(src)].") - usr.log_message("activated a smoke machine that contains [english_list(reagents.reagent_list)] at [AREACOORD(src)].", LOG_GAME) + usr.log_message("activated a smoke machine that contains [english_list(reagents.reagent_list)]", LOG_GAME) log_combat(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)] at [AREACOORD(src)].") if("goScreen") screen = params["screen"] diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 508066ed20a..a914d65503f 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -75,7 +75,7 @@ /// Toggles whether or not researched_disabled is, yknow, disabled /obj/machinery/rnd/server/proc/toggle_disable(mob/user) research_disabled = !research_disabled - user.log_message("[research_disabled ? "shut off" : "turned on"] [src] at [loc_name(user)].", LOG_GAME) + user.log_message("[research_disabled ? "shut off" : "turned on"] [src]", LOG_GAME) refresh_working() /// Gets status text based on this server's status for the computer. diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 2cf09e2f86a..340f090f752 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -219,13 +219,13 @@ say("Software override initiated.") var/turf/console_hijack_turf = get_turf(src) message_admins("[src] is being overriden for hijack by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(console_hijack_turf)]") - user.log_message("is hijacking [src] at [AREACOORD(src)].", LOG_GAME) + user.log_message("is hijacking [src].", LOG_GAME) . = FALSE if(do_after(user, hijack_stage_time * (1 / user.mind.get_hijack_speed()), target = src)) increase_hijack_stage() console_hijack_turf = get_turf(src) message_admins("[ADMIN_LOOKUPFLW(user)] has hijacked [src] in [ADMIN_VERBOSEJMP(console_hijack_turf)]. Hijack stage increased to stage [SSshuttle.emergency.hijack_status] out of [HIJACKED].") - user.log_message("has hijacked [src] at [AREACOORD(src)]. Hijack stage increased to stage [SSshuttle.emergency.hijack_status] out of [HIJACKED].", LOG_GAME) + user.log_message("has hijacked [src]. Hijack stage increased to stage [SSshuttle.emergency.hijack_status] out of [HIJACKED].", LOG_GAME) . = TRUE to_chat(user, span_notice("You reprogram some of [src]'s programming, putting it on timeout for [hijack_stage_cooldown/10] seconds.")) hijack_hacking = FALSE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index eb0c3f28a2f..6a739f7ff28 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -88,7 +88,7 @@ update_icon_dropped() if(!QDELETED(brainmob)) //this shouldn't happen without badminnery. message_admins("Brainmob: ([ADMIN_LOOKUPFLW(brainmob)]) was left stranded in [src] at [ADMIN_VERBOSEJMP(src)] without a brain!") - brainmob.log_message(", brainmob, was left stranded in [src] at [AREACOORD(src)] without a brain!", LOG_GAME) + brainmob.log_message(", brainmob, was left stranded in [src] without a brain", LOG_GAME) if(head_atom == brainmob) brainmob = null if(head_atom == eyes) diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index bac1d8df4e3..3d001477b14 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -98,8 +98,8 @@ log_message("[brain_obj] moved in as pilot.", LOG_MECHA) if(!internal_damage) SEND_SOUND(brain_obj, sound('sound/mecha/nominal.ogg',volume=50)) - user.log_message("has put the MMI/posibrain of [key_name(brain_mob)] into [src] at [AREACOORD(src)].", LOG_GAME) - brain_mob.log_message("was put into [src] by [key_name(user)] at [AREACOORD(src)].", LOG_GAME, log_globally = FALSE) + user.log_message("has put the MMI/posibrain of [key_name(brain_mob)] into [src]", LOG_GAME) + brain_mob.log_message("was put into [src] by [key_name(user)]", LOG_GAME, log_globally = FALSE) return TRUE /obj/vehicle/sealed/mecha/mob_exit(mob/M, silent, forced)