From 8df7202455889b3b1160dd162958d53366959e67 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 6 Dec 2023 07:36:04 +0100 Subject: [PATCH] [MIRROR] Rename notify_ghost_cloning to notify_revival [MDB IGNORE] (#25442) * Rename notify_ghost_cloning to notify_revival (#80096) ## About The Pull Request Renames - `/mob/proc/notify_ghost_cloning` to `/mob/proc/notify_revival` - `/mob/dead/observer/proc/notify_cloning` to `/mob/dead/observer/proc/send_revival_notification` - `/atom/movable/screen/alert/notify_cloning` to `/atom/movable/screen/alert/revival`. I could have found a way to merge both procs together but default parameters keep me up at night. ## Why It's Good For The Game Conciseness, code that is named after a removed feature is silly. ## Changelog nothing playerfacing * Rename notify_ghost_cloning to notify_revival * Missed wow * Modular --------- Co-authored-by: distributivgesetz Co-authored-by: SomeRandomOwl --- code/_onclick/hud/alert.dm | 4 ++-- code/datums/components/ling_decoy_brain.dm | 2 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/objects/items/defib.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 ++-- code/modules/mob/living/brain/MMI.dm | 4 ++-- code/modules/mob/mob.dm | 6 +++--- code/modules/mod/mod_ai.dm | 2 +- .../modular_computers/file_system/programs/airestorer.dm | 2 +- .../reagents/chemistry/reagents/medicine_reagents.dm | 2 +- .../surgery/organs/internal/cyberimp/augments_chest.dm | 2 +- code/modules/surgery/revival.dm | 2 +- code/modules/vehicles/mecha/mecha_wreckage.dm | 2 +- .../modules/primitive_catgirls/code/smelling_salts.dm | 2 +- .../synths/code/surgery/robot_chassis_restoration.dm | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index a0b9ac88925..36c1bf8a799 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -764,13 +764,13 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //GHOSTS //TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages -/atom/movable/screen/alert/notify_cloning +/atom/movable/screen/alert/revival name = "Revival" desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!" icon_state = "template" timeout = 300 -/atom/movable/screen/alert/notify_cloning/Click() +/atom/movable/screen/alert/revival/Click() . = ..() if(!.) return diff --git a/code/datums/components/ling_decoy_brain.dm b/code/datums/components/ling_decoy_brain.dm index 7bcb4e38c8f..917e8f2fbbd 100644 --- a/code/datums/components/ling_decoy_brain.dm +++ b/code/datums/components/ling_decoy_brain.dm @@ -54,7 +54,7 @@ to_chat(the_real_ling, span_ghostalert("We detect our decoy brain has been placed within a Man-Machine Interface. \ We can use the \"MMI Talk\" action to command it to speak.")) else - the_real_ling.notify_ghost_cloning("Your decoy brain has been placed in an MMI, re-enter your body to talk via it!", source = the_real_ling, flashwindow = TRUE) + the_real_ling.notify_revival("Your decoy brain has been placed in an MMI, re-enter your body to talk via it!", source = the_real_ling, flashwindow = TRUE) talk_action.Grant(the_real_ling) else if(talk_action?.owner == the_real_ling) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 2bc13e156d4..2ddbb3baadd 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -60,7 +60,7 @@ to_chat(usr, span_notice("Reconstruction in progress. This will take several minutes.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE - occupier.notify_ghost_cloning("Your core files are being restored!", source = src) + occupier.notify_revival("Your core files are being restored!", source = src) . = TRUE /obj/machinery/computer/aifixer/proc/Fix() diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 88a1f582a60..bfcb42a94b2 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -489,7 +489,7 @@ return if(H.can_defib() == DEFIB_POSSIBLE) - H.notify_ghost_cloning("Your heart is being defibrillated!") + H.notify_revival("Your heart is being defibrillated!") H.grab_ghost() // Shove them back in their body. do_help(H, user) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index fc7df3e6312..a8cb7e9eb4d 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -441,13 +441,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, span_boldnotice("You can no longer be brought back into your body.")) return TRUE -/mob/dead/observer/proc/notify_cloning(message, sound, atom/source, flashwindow = TRUE) +/mob/dead/observer/proc/send_revival_notification(message, sound, atom/source, flashwindow) if(flashwindow) window_flash(client) if(message) to_chat(src, span_ghostalert("[message]")) if(source) - var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_notify_cloning", /atom/movable/screen/alert/notify_cloning) + var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_revival", /atom/movable/screen/alert/revival) if(A) var/ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) var/erp_ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) //SKYRAT EDIT - ADDITION - ERP ICONS FIX diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index 663da2ee8a8..c142006856f 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -74,7 +74,7 @@ return var/mob/living/brain/B = newbrain.brainmob if(!B.key && !newbrain.decoy_override) - B.notify_ghost_cloning("Someone has put your brain in a MMI!", source = src) + B.notify_revival("Someone has put your brain in a MMI!", source = src) user.visible_message(span_notice("[user] sticks \a [newbrain] into [src]."), span_notice("[src]'s indicator light turn on as you insert [newbrain].")) set_brainmob(newbrain.brainmob) @@ -140,7 +140,7 @@ var/mob/living/brain/new_brain_brainmob = new_brain.brainmob if(!new_brain_brainmob.key && !new_brain.decoy_override) - new_brain_brainmob.notify_ghost_cloning("Someone has put your brain in a MMI!", source = src) + new_brain_brainmob.notify_revival("Someone has put your brain in a MMI!", source = src) set_brainmob(new_brain_brainmob) new_brain.brainmob = null diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ebe686af9d7..c9e41734f15 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1042,11 +1042,11 @@ if(mind) return mind.grab_ghost(force = force) -///Notify a ghost that it's body is being cloned -/mob/proc/notify_ghost_cloning(message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", sound = 'sound/effects/genetics.ogg', atom/source = null, flashwindow) +///Notify a ghost that its body is being revived +/mob/proc/notify_revival(message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", sound = 'sound/effects/genetics.ogg', atom/source = null, flashwindow = TRUE) var/mob/dead/observer/ghost = get_ghost() if(ghost) - ghost.notify_cloning(message, sound, source, flashwindow) + ghost.send_revival_notification(message, sound, source, flashwindow) return ghost /** diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index fb83518c562..a78c7be77b6 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -218,7 +218,7 @@ icon_state = "minicard" ai.forceMove(card) card.AI = ai - ai.notify_ghost_cloning("You have been recovered from the wreckage!", source = card) + ai.notify_revival("You have been recovered from the wreckage!", source = card) balloon_alert(user, "ai transferred to card") stored_ai = null #undef AI_FALL_TIME diff --git a/code/modules/modular_computers/file_system/programs/airestorer.dm b/code/modules/modular_computers/file_system/programs/airestorer.dm index ee3f983cbd5..0ee695f8fd6 100644 --- a/code/modules/modular_computers/file_system/programs/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/airestorer.dm @@ -106,7 +106,7 @@ var/mob/living/silicon/ai/A = stored_card.AI if(A && A.health < 100) restoring = TRUE - A.notify_ghost_cloning("Your core files are being restored!", source = computer) + A.notify_revival("Your core files are being restored!", source = computer) return TRUE if("PRG_eject") if(stored_card) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index e4c746fb489..303a85c6b4b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -999,7 +999,7 @@ return exposed_mob.visible_message(span_warning("[exposed_mob]'s body starts convulsing!")) - exposed_mob.notify_ghost_cloning("Your body is being revived with Strange Reagent!") + exposed_mob.notify_revival("Your body is being revived with Strange Reagent!") exposed_mob.do_jitter_animation(10) // we factor in healing needed when determing if we do anything diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm index 1ea3a1bf9c4..3fe5e150288 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm @@ -92,7 +92,7 @@ if(owner.stat == DEAD) can_defib_owner = owner.can_defib() if(can_defib_owner == DEFIB_POSSIBLE) - owner.notify_ghost_cloning("You are being revived by [src]!") + owner.notify_revival("You are being revived by [src]!") owner.grab_ghost() /// boolean that stands for if PHYSICAL damage being patched var/body_damage_patched = FALSE diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm index e199df0ffd9..f0a08585eae 100644 --- a/code/modules/surgery/revival.dm +++ b/code/modules/surgery/revival.dm @@ -75,7 +75,7 @@ span_notice("[user] prepares to shock [target]'s brain with [tool]."), span_notice("[user] prepares to shock [target]'s brain with [tool]."), ) - target.notify_ghost_cloning("Someone is trying to zap your brain.", source = target) + target.notify_revival("Someone is trying to zap your brain.", source = target) /datum/surgery_step/revive/play_preop_sound(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) if(istype(tool, /obj/item/shockpaddles)) diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm index 8f3e821a5bf..8896b7268fe 100644 --- a/code/modules/vehicles/mecha/mecha_wreckage.dm +++ b/code/modules/vehicles/mecha/mecha_wreckage.dm @@ -105,7 +105,7 @@ if(AI.client) //AI player is still in the dead AI and is connected to_chat(AI, span_notice("The remains of your file system have been recovered on a mobile storage device.")) else //Give the AI a heads-up that it is probably going to get fixed. - AI.notify_ghost_cloning("You have been recovered from the wreckage!", source = card) + AI.notify_revival("You have been recovered from the wreckage!", source = card) to_chat(user, "[span_boldnotice("Backup files recovered")]: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory.") AI = null diff --git a/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm b/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm index e67b75d141b..103dadbc6a9 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm @@ -25,7 +25,7 @@ /// If the right conditions are present (basically could this person be defibrilated), revives the target /obj/item/smelling_salts/proc/try_revive(mob/living/carbon/carbon_target, mob/user) - carbon_target.notify_ghost_cloning("You are being brought back to life!") + carbon_target.notify_revival("You are being brought back to life!") carbon_target.grab_ghost() user.balloon_alert_to_viewers("trying to revive [carbon_target]") diff --git a/modular_skyrat/modules/synths/code/surgery/robot_chassis_restoration.dm b/modular_skyrat/modules/synths/code/surgery/robot_chassis_restoration.dm index 42e3ff853bb..d80c68e3e35 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_chassis_restoration.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_chassis_restoration.dm @@ -87,7 +87,7 @@ span_notice("[user] begins to force a reboot in [target]'s posibrain."), ) - target.notify_ghost_cloning("Someone is trying to reboot your posibrain.", source = target) + target.notify_revival("Someone is trying to reboot your posibrain.", source = target) /datum/surgery_step/finalize_positronic_restoration/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if (target.stat < DEAD)