diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 44f5c24d3c3c..17f9568664bf 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -1,8 +1,8 @@ -/proc/get_area_name(atom/X, format_text = FALSE) - var/area/A = isarea(X) ? X : get_area(X) - if(!A) +/proc/get_area_name(atom/target, format_text = FALSE) + var/area/target_area = get_area(target) + if(!target_area) return null - return format_text ? format_text(A.name) : A.name + return format_text ? format_text(target_area.name) : target_area.name /proc/in_range(source, user) if(get_dist(source, user) <= 1) diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index c6225f6b1028..e2374446d449 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) if(3) hive.tier_3_xenos |= new_xeno - log_game("EVOLVE: [key_name(src)] evolved into [new_xeno].") + log_game("EVOLVE: [key_name(src)] evolved into [new_xeno]. (Location: [AREACOORD(loc)])") if(mind) mind.transfer_to(new_xeno) else @@ -413,7 +413,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) var/mob/living/carbon/xenomorph/new_xeno = transmute(newcaste) if(new_xeno) - log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno].") + log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno]. (Location: [AREACOORD(loc)])") if(new_xeno.ckey) GLOB.deevolved_ckeys += new_xeno.ckey diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index 1e0ffb688315..d9478d8c4b4b 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -99,7 +99,7 @@ if(!filter_message(src, message)) return - log_hivemind("[key_name(src)] : [message]") + log_hivemind("[key_name(src)] : [message] (AREA: [get_area_name(loc)])") var/track = "" var/overwatch_target = XENO_OVERWATCH_TARGET_HREF diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm index 84fca3ced6f6..81924ca2b016 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm @@ -270,6 +270,6 @@ xeno.xeno_jitter(1 SECONDS) xeno.flick_heal_overlay(3 SECONDS, "#00B800") xeno.emote("roar") - log_attack("[key_name(xeno)] was executed by [key_name(target_carbon)] with a headbite!") + log_attack("[key_name(target_carbon)] was executed by [key_name(xeno)] with a headbite!") apply_cooldown() return ..()