From 573ced1214e2e144c344f50d0353006152e969d2 Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Thu, 28 Sep 2023 02:28:21 +0800 Subject: [PATCH 1/4] Makes Pylon Alert Message Better Stress Its Danger To Marines (#4518) # About the pull request Makes the message given to Marines better emphasize how dangerous the pylon is Tells xenos they get larva from a captured pylon. # Explain why it's good for the game There is no in-game communication to Marines that a pylon is a really bad thing that is granting Xenos free larva, you only get vague message about some "weird stuff happening". Essentially it means marines oft ignore the pylon, or worse yet think xenos need both towers cause that is how the nuke works. Considering how important this is, it should not be hidden lore that pylons grant larva even if you only have 1 captured. This goes for both sides but especially marines. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Alert message regarding Pylon construction around a communications array now properly emphasizes why it is a threat to Marines, and a benefit to Xenos. /:cl: --------- Co-authored-by: Steelpoint --- code/modules/cm_aliens/structures/special/pylon_core.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index c24c34de099c..9c122452d41f 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -164,7 +164,7 @@ /// Checks if all comms towers are connected and then starts end game content on all pylons if they are /obj/effect/alien/resin/special/pylon/endgame/proc/comms_relay_connection() - marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)].", "[MAIN_AI_SYSTEM] Biological Scanner") + marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)], biological hazard detected.\n\nDANGER: Hazard is generating new xenomorph entities, advise urgent termination of hazard by ground forces.", "[MAIN_AI_SYSTEM] Biological Scanner") for(var/hivenumber in GLOB.hive_datum) var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber] @@ -172,7 +172,7 @@ continue if(checked_hive == linked_hive) - xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)]. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)].\n\nWe will now grow more of our number from this pylon. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE) else xeno_announcement(SPAN_XENOANNOUNCE("Another hive has harnessed the tall's communication relay at [get_area(src)].[linked_hive.faction_is_ally(checked_hive.name) ? "" : " Stop them!"]"), hivenumber, XENO_GENERAL_ANNOUNCE) From 68fd6699ed2671ce9882916d36d2e38efe8c1ece Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:37:08 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #4518 [ci skip] --- html/changelogs/AutoChangeLog-pr-4518.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4518.yml diff --git a/html/changelogs/AutoChangeLog-pr-4518.yml b/html/changelogs/AutoChangeLog-pr-4518.yml new file mode 100644 index 000000000000..f229bff30960 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4518.yml @@ -0,0 +1,4 @@ +author: "Steelpoint" +delete-after: True +changes: + - rscadd: "Alert message regarding Pylon construction around a communications array now properly emphasizes why it is a threat to Marines, and a benefit to Xenos." \ No newline at end of file From f21e167e2c098eea787af3e3d8367bcbb4c15406 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:29:01 +0200 Subject: [PATCH 3/4] Disallows taking control of crit xenos (#4517) # About the pull request Best case: You get to sit in crit and heal, then play. Worst case: You're off-weeds and die slowly, losing your place in the larva queue. This removes the worst case, while still allowing the best case (Just take control after they're out of crit.) # Explain why it's good for the game # Testing Photographs and Procedure # Changelog :cl: qol: You can no longer doom yourself by joining as a crit xeno /:cl: --- code/game/gamemodes/cm_initialize.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 36271054bb21..578105f98728 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -446,6 +446,10 @@ Additional game mode variables. to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is dead.")) return FALSE + if(new_xeno.stat == UNCONSCIOUS) + to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is in critical condition or unconscious.")) + return FALSE + if(!xeno_bypass_timer) var/deathtime = world.time - xeno_candidate.timeofdeath if(istype(xeno_candidate, /mob/new_player)) From 9665f5f3ad425024fb932c0d9f85579dc11f6027 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:58:38 +0100 Subject: [PATCH 4/4] Automatic changelog for PR #4517 [ci skip] --- html/changelogs/AutoChangeLog-pr-4517.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4517.yml diff --git a/html/changelogs/AutoChangeLog-pr-4517.yml b/html/changelogs/AutoChangeLog-pr-4517.yml new file mode 100644 index 000000000000..fd2532119e80 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4517.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk" +delete-after: True +changes: + - qol: "You can no longer doom yourself by joining as a crit xeno" \ No newline at end of file