mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-09 16:05:07 +00:00
Changes all uses of notify_ghosts to use the real names of mobs (#90919)
## About The Pull Request Quite simple - this changes every direct mention of a mob in a `notify_ghosts` message to use `[mob.real_name]` instead of just `[mob]` ## Why It's Good For The Game makes things less confusing - ghosts can see easily their actual identity anyways, so it's not like there's much of a reason _not_ to do this. ## Changelog 🆑 qol: Ghost notifications will now use the real names of mobs when something happens (i.e no more "Unknown has completed an ascension ritual!") /🆑
This commit is contained in:
@@ -865,7 +865,7 @@
|
||||
message_admins("[ADMIN_LOOKUPFLW(obsessed)] has been made Obsessed by the midround ruleset.")
|
||||
log_game("[key_name(obsessed)] was made Obsessed by the midround ruleset.")
|
||||
notify_ghosts(
|
||||
"[obsessed] has developed an obsession with someone!",
|
||||
"[obsessed.real_name] has developed an obsession with someone!",
|
||||
source = obsessed,
|
||||
header = "Love Can Bloom",
|
||||
)
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
|
||||
RegisterSignal(owner, COMSIG_ATOM_SPLASHED, PROC_REF(on_splashed))
|
||||
notify_ghosts(
|
||||
"[owner] is blacking out!",
|
||||
"[owner.real_name] is blacking out!",
|
||||
source = owner,
|
||||
header = "Bro I'm not even drunk right now",
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
|
||||
@@ -380,7 +380,7 @@
|
||||
LAZYADD(shields, new /obj/structure/emergency_shield/cult/narsie(shielded_turf))
|
||||
|
||||
notify_ghosts(
|
||||
"[cultist] has begun scribing a Nar'Sie rune!",
|
||||
"[cultist.real_name] has begun scribing a Nar'Sie rune!",
|
||||
source = cultist,
|
||||
header = "Maranax Infirmux!",
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
|
||||
@@ -39,15 +39,20 @@
|
||||
if(deadchat_mode & ANARCHY_MODE) // Choose one, please.
|
||||
stack_trace("deadchat_control component added to [parent.type] with both democracy and anarchy modes enabled.")
|
||||
timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP)
|
||||
notify_ghosts(
|
||||
"[parent] is now deadchat controllable!",
|
||||
source = parent,
|
||||
header = "Ghost Possession!",
|
||||
)
|
||||
if(!ismob(parent) && !SSpoints_of_interest.is_valid_poi(parent))
|
||||
SSpoints_of_interest.make_point_of_interest(parent)
|
||||
generated_point_of_interest = TRUE
|
||||
|
||||
var/parent_name = "[parent]"
|
||||
if(ismob(parent))
|
||||
var/mob/mob_parent = parent
|
||||
parent_name = "[mob_parent.real_name]"
|
||||
notify_ghosts(
|
||||
"[parent_name] is now deadchat controllable!",
|
||||
source = parent,
|
||||
header = "Ghost Possession!",
|
||||
)
|
||||
|
||||
/datum/component/deadchat_control/Destroy(force)
|
||||
on_removal?.Invoke()
|
||||
inputs = null
|
||||
|
||||
@@ -23,8 +23,13 @@
|
||||
src.bite_chance = bite_chance
|
||||
src.minimum_scale = minimum_scale
|
||||
initial_reagent_volume = atom_parent.reagents.total_volume
|
||||
|
||||
var/parent_name = "[parent]"
|
||||
if(ismob(parent))
|
||||
var/mob/mob_parent = parent
|
||||
parent_name = "[mob_parent.real_name]"
|
||||
notify_ghosts(
|
||||
"[parent] is edible by ghosts!",
|
||||
"[parent_name] is edible by ghosts!",
|
||||
source = parent,
|
||||
header = "Something Tasty!",
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
|
||||
@@ -306,7 +306,7 @@
|
||||
if(istype(consumed_mob, /mob/living/basic/parrot/poly)) // Dusting Poly creates a power surge
|
||||
force_event(/datum/round_event_control/supermatter_surge/poly, "Poly's revenge")
|
||||
notify_ghosts(
|
||||
"[consumed_mob] has been dusted by [atom_source]!",
|
||||
"[consumed_mob.real_name] has been dusted by [atom_source]!",
|
||||
source = atom_source,
|
||||
header = "Polytechnical Difficulties",
|
||||
)
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
|
||||
if(carbon_occupant.stat < UNCONSCIOUS)
|
||||
notify_ghosts(
|
||||
"[occupant] is about to be ground up by a malfunctioning organ harvester!",
|
||||
"[carbon_occupant.real_name] is about to be ground up by a malfunctioning organ harvester!",
|
||||
source = src,
|
||||
header = "Gruesome!",
|
||||
)
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(src)]")
|
||||
user.log_message("activated a powersink", LOG_GAME)
|
||||
notify_ghosts(
|
||||
"[user] has activated a power sink!",
|
||||
"[user.real_name] has activated a power sink!",
|
||||
source = src,
|
||||
header = "Shocking News!",
|
||||
)
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
target.equip_to_slot_if_possible(src, ITEM_SLOT_HEAD)
|
||||
arm()
|
||||
notify_ghosts(
|
||||
"[user] put a reverse bear trap on [target]!",
|
||||
"[user.real_name] put a reverse bear trap on [target.real_name]!",
|
||||
source = src,
|
||||
header = "Reverse bear trap armed",
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
if (!(src in user.held_items))
|
||||
return FALSE
|
||||
notify_ghosts(
|
||||
"[user] is shaking [src], hoping to get an answer to \"[selected_message]\"",
|
||||
"[user.real_name] is shaking [src], hoping to get an answer to \"[selected_message]\"",
|
||||
source = src,
|
||||
header = "Magic eightball",
|
||||
click_interact = TRUE,
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
target_icon.Blend(icon(icon, icon_state), ICON_OVERLAY)
|
||||
var/mutable_appearance/bomb_target_image = mutable_appearance(target_icon)
|
||||
notify_ghosts(
|
||||
"[user] has planted \a [src] on [target] with a [det_time] second fuse!",
|
||||
"[user.real_name] has planted \a [src] on [target] with a [det_time] second fuse!",
|
||||
source = bomb_target,
|
||||
header = "Explosive Planted",
|
||||
alert_overlay = bomb_target_image,
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
adjust_bloodthirst(1)
|
||||
force_bonus = HIS_GRACE_FORCE_BONUS * LAZYLEN(contents)
|
||||
notify_ghosts(
|
||||
"[user] has awoken His Grace!",
|
||||
"[user.real_name] has awoken His Grace!",
|
||||
source = src,
|
||||
header = "All Hail His Grace!",
|
||||
)
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
active = TRUE
|
||||
if(detonate_explosion) //doesn't send a notification unless it's a genuine, exploding hot potato.
|
||||
notify_ghosts(
|
||||
"[user] has primed a Hot Potato!",
|
||||
"[user.real_name] has primed a Hot Potato!",
|
||||
source = src,
|
||||
header = "Hot Hot Hot!",
|
||||
)
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
imp_in.visible_message(span_warning("[imp_in] starts beeping ominously!"))
|
||||
if(notify_ghosts)
|
||||
notify_ghosts(
|
||||
"[imp_in] is about to detonate their explosive implant!",
|
||||
"[imp_in.real_name] is about to detonate their explosive implant!",
|
||||
source = src,
|
||||
header = "Tick Tick Tick...",
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
|
||||
@@ -607,7 +607,7 @@
|
||||
SSblackbox.record_feedback("tally", "heretic_ascended", 1, GLOB.heretic_research_tree[type][HKT_ROUTE])
|
||||
log_heretic_knowledge("[key_name(user)] completed their final ritual at [gameTimestamp()].")
|
||||
notify_ghosts(
|
||||
"[user] has completed an ascension ritual!",
|
||||
"[user.real_name] has completed an ascension ritual!",
|
||||
source = user,
|
||||
header = "A Heretic is Ascending!",
|
||||
)
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
COOLDOWN_START(src, ghost_alert_cooldown, TAROT_GHOST_TIMER)
|
||||
notify_ghosts(
|
||||
"Someone has begun playing with a [src.name] in [get_area(src)]!",
|
||||
"Someone has begun playing with a [name] in [get_area(src)]!",
|
||||
source = src,
|
||||
header = "Haunted Tarot Deck",
|
||||
ghost_sound = 'sound/effects/ghost2.ogg',
|
||||
|
||||
@@ -612,7 +612,7 @@
|
||||
if(istype(potential_fooditem, /obj/item/modular_computer) && prob(75))
|
||||
pda_failure = TRUE
|
||||
notify_ghosts(
|
||||
"[cooker] has overheated their PDA!",
|
||||
"[cooker.real_name] has overheated their PDA!",
|
||||
source = src,
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
header = "Hunger Games: Catching Fire",
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
eyeballies.Remove(target)
|
||||
eyeballies.forceMove(get_turf(target))
|
||||
notify_ghosts(
|
||||
"[target] has just had their eyes snatched!",
|
||||
"[target.real_name] has just had their eyes snatched!",
|
||||
source = target,
|
||||
header = "Ouch!",
|
||||
)
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
COOLDOWN_START(src, summon_cooldown, 60 SECONDS)
|
||||
to_chat(user, span_notice("You call out for aid, attempting to summon spirits to your side."))
|
||||
notify_ghosts(
|
||||
"[user] is raising [user.p_their()] [name], calling for your help!",
|
||||
"[user.real_name] is raising [user.p_their()] [name], calling for your help!",
|
||||
source = user,
|
||||
ignore_key = POLL_IGNORE_SPECTRAL_BLADE,
|
||||
header = "Spectral blade",
|
||||
|
||||
@@ -239,7 +239,7 @@
|
||||
var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/aicards.dmi', "pai")
|
||||
|
||||
notify_ghosts(
|
||||
"[user] is requesting a pAI companion! Use the pAI button to submit yourself as one.",
|
||||
"[user.real_name] is requesting a pAI companion! Use the pAI button to submit yourself as one.",
|
||||
source = user,
|
||||
header = "pAI Request!",
|
||||
alert_overlay = alert_overlay,
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
if(good_kind_of_healing && !reaping && SPT_PROB(0.005, seconds_per_tick)) //janken with the grim reaper!
|
||||
notify_ghosts(
|
||||
"[affected_mob] has entered a game of rock-paper-scissors with death!",
|
||||
"[affected_mob.real_name] has entered a game of rock-paper-scissors with death!",
|
||||
source = affected_mob,
|
||||
header = "Who Will Win?",
|
||||
)
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
if(isnull(owner.client))
|
||||
return
|
||||
notify_ghosts(
|
||||
"[owner] has developed spontaneous appendicitis!",
|
||||
"[owner.real_name] has developed spontaneous appendicitis!",
|
||||
source = owner,
|
||||
header = "Whoa, Sick!",
|
||||
)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
return
|
||||
|
||||
notify_ghosts(
|
||||
"[user] has purchased a BADASS Syndicate Balloon!",
|
||||
"[user.real_name] has purchased a BADASS Syndicate Balloon!",
|
||||
source = .,
|
||||
header = "What are they THINKING?",
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user