mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Rename notify_ghost_cloning to notify_revival (#80096)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## 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. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Conciseness, code that is named after a removed feature is silly. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> nothing playerfacing <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -429,13 +429,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)
|
||||
if(ui_style)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -995,11 +995,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
|
||||
|
||||
/**
|
||||
|
||||
@@ -206,7 +206,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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user