From f77a2de7a0bfe2be4abe3dbe3aa7c06a17a34825 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Thu, 24 Aug 2023 07:48:20 +0100 Subject: [PATCH] and the rest --- code/__DEFINES/hud.dm | 1 + code/modules/cm_aliens/structures/special/pylon_core.dm | 2 +- code/modules/cm_marines/overwatch.dm | 3 ++- code/modules/maptext_alerts/screen_alerts.dm | 2 ++ code/modules/mob/living/carbon/human/death.dm | 2 +- code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 2 +- code/modules/mob/living/carbon/xenomorph/death.dm | 2 +- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index d957146e8322..38e5693dcbe5 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -22,3 +22,4 @@ #define NOTIFY_JUMP "jump" #define NOTIFY_ATTACK "attack" #define NOTIFY_ORBIT "orbit" +#define NOTIFY_JOIN_XENO "join_xeno" diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index 068ffeb659eb..614c498fefaa 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -233,7 +233,7 @@ last_surge_time = world.time linked_hive.stored_larva++ linked_hive.hijack_burrowed_left-- - announce_dchat("The hive has gained another burrowed larva! Use the Join As Xeno verb to take it.", src) + notify_ghosts(header = "Claim Xeno", message = "The Hive has gained another burrowed larva! Click to take it.", source = src, action = NOTIFY_JOIN_XENO) if(surge_cooldown > 30 SECONDS) //mostly for sanity purposes surge_cooldown = surge_cooldown - surge_incremental_reduction //ramps up over time if(linked_hive.hijack_burrowed_left < 1) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 070cf1f6c1cf..d295881cf697 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -862,7 +862,8 @@ return var/ob_name = lowertext(almayer_orbital_cannon.tray.warhead.name) - announce_dchat("\A [ob_name] targeting [A.name] has been fired!", T) + var/mutable_appearance/warhead_appearance = mutable_appearance(almayer_orbital_cannon.tray.warhead.icon, almayer_orbital_cannon.tray.warhead.icon_state) + notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [A.name] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) message_admins(FONT_SIZE_HUGE("ALERT: [key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]' [ADMIN_JMP(T)]")) log_attack("[key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]'") diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm index 6b5fcad1097d..6d251080e87b 100644 --- a/code/modules/maptext_alerts/screen_alerts.dm +++ b/code/modules/maptext_alerts/screen_alerts.dm @@ -244,3 +244,5 @@ ghost_user.forceMove(gotten_turf) if(NOTIFY_ORBIT) ghost_user.ManualFollow(target) + if(NOTIFY_JOIN_XENO) + ghost_user.join_as_alien() diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 3896cd1f9ded..19810893694a 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -104,7 +104,7 @@ delayer_armour.can_camo = FALSE //fuck you to_chat(delayer, SPAN_WARNING("Your [delayer_armour]'s camo system breaks!")) //tell the ghosts - announce_dchat("There is only one person left: [last_living_human.real_name].", last_living_human) + notify_ghosts(header = "Last Human", message = "There is only one person left: [last_living_human.real_name]!", source = last_living_human, action = NOTIFY_ORBIT) var/death_message = species.death_message if(HAS_TRAIT(src, TRAIT_HARDCORE)) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index dd53868caf36..dc8e693c7038 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -1086,7 +1086,7 @@ handle_ghost_message() /mob/living/carbon/xenomorph/proc/handle_ghost_message() - announce_dchat("[src] ([mutation_type] [caste_type]) has ghosted and their body is up for grabs!", src) + notify_ghosts("[src] ([mutation_type] [caste_type]) has ghosted and their body is up for grabs!", source = src) /mob/living/carbon/xenomorph/larva/handle_ghost_message() if(locate(/obj/effect/alien/resin/special/pylon/core) in range(2, get_turf(src))) diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index 832ba9f2c4c6..7fa8fc002826 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -130,7 +130,7 @@ // Tell the xeno she is the last one. if(X.client) to_chat(X, SPAN_XENOANNOUNCE("Your carapace rattles with dread. You are all that remains of the hive!")) - announce_dchat("There is only one Xenomorph left: [X.name].", X) + notify_ghosts(header = "Last Xenomorph", message = "There is only one Xenomorph left: [X.name].", source = X, action = NOTIFY_ORBIT) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_XENO_DEATH, src, gibbed) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 5ad84e17f159..837f9a7f6aeb 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -216,7 +216,7 @@ dropship.control_doors("unlock", "all", TRUE) dropship_control_lost = TRUE door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE) - announce_dchat("[xeno] has locked \the [dropship]", src) + notify_ghosts(header = "Dropship Locked", message = "[xeno] has locked [dropship]!", source = xeno, action = NOTIFY_ORBIT) if(almayer_orbital_cannon) almayer_orbital_cannon.is_disabled = TRUE