diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 7dee695c2d5..3cb1eae5b17 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -555,7 +555,10 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." var/datum/objective/eldergod/summon_objective = locate() in antag.cult_team.objectives if(!summon_objective) return - desc = "The sacrifice is complete, summon Nar'Sie! The summoning can only take place in [english_list(summon_objective.summon_spots)]!" + var/list/location_list = list() + for(var/area/area_to_check in summon_objective.summon_spots) + location_list += area_to_check.get_original_area_name() + desc = "The sacrifice is complete, summon Nar'Sie! The summoning can only take place in [english_list(location_list)]!" if(icon_state == "runed_sense1") return animate(src, transform = null, time = 1, loop = 0) diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index b5defe4306d..4892b8740ef 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -356,7 +356,8 @@ return if(!check_if_in_ritual_site(cultist, cult_team)) return FALSE - priority_announce("Figments from an eldritch god are being summoned by [cultist.real_name] into [get_area(cultist)] from an unknown dimension. Disrupt the ritual at all costs!", "Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES, has_important_message = TRUE) + var/area/summon_location = get_area(cultist) + priority_announce("Figments from an eldritch god are being summoned by [cultist.real_name] into [summon_location.get_original_area_name()] from an unknown dimension. Disrupt the ritual at all costs!", "Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES, has_important_message = TRUE) for(var/shielded_turf in spiral_range_turfs(1, cultist, 1)) LAZYADD(shields, new /obj/structure/emergency_shield/cult/narsie(shielded_turf)) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 0f8f867d725..a57bdd71d3f 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -538,3 +538,15 @@ GLOBAL_LIST_EMPTY(teleportlocs) /// Called when a living mob that spawned here, joining the round, receives the player client. /area/proc/on_joining_game(mob/living/boarder) return + +/** + * Returns the name of an area, with the original name if the area name has been changed. + * + * If an area has not been renamed, returns the area name. If it has been modified (by blueprints or other means) + * returns the current name, as well as the initial value, in the format of [Current Location Name (Original Name)] + */ + +/area/proc/get_original_area_name() + if(name == initial(name)) + return name + return "[name] ([initial(name)])"