From c2dc228a28b7a812a61b352149204d4c4d798127 Mon Sep 17 00:00:00 2001
From: InsaneRed <47158596+InsaneRed@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:49:30 +0300
Subject: [PATCH] More WE/YOU fixes (#5276)
# About the pull request
fixes a few more stuff i missed
# Explain why it's good for the game
connsistency is good
# Testing Photographs and Procedure
Screenshots & Videos
it works
# Changelog
:cl:
spellcheck: More WE/YOU fixes for xenomorph side.
/:cl:
---------
Co-authored-by: InsaneRed
---
code/datums/construction/construction_template.dm | 2 +-
.../modules/cm_aliens/structures/special/pylon_core.dm | 2 +-
code/modules/cm_aliens/structures/trap.dm | 6 +++---
.../mob/living/carbon/xenomorph/castes/Ravager.dm | 2 +-
.../modules/mob/living/carbon/xenomorph/hive_status.dm | 10 +++++-----
.../xenomorph/mutators/strains/carrier/eggsac.dm | 2 +-
.../xenomorph/mutators/strains/praetorian/vanguard.dm | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/code/datums/construction/construction_template.dm b/code/datums/construction/construction_template.dm
index 664d289b9dd3..37832327c381 100644
--- a/code/datums/construction/construction_template.dm
+++ b/code/datums/construction/construction_template.dm
@@ -46,7 +46,7 @@
if(plasma_stored >= plasma_required)
to_chat(xeno, SPAN_WARNING("\The [name] does not require plasma."))
return
- to_chat(xeno, SPAN_NOTICE("You begin adding \the plasma to \the [name]."))
+ to_chat(xeno, SPAN_NOTICE("We begin adding \the plasma to \the [name]."))
xeno_attack_delay(xeno)
if(!do_after(xeno, 40, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
return
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
index 2350ecfa4462..13f3e488459e 100644
--- a/code/modules/cm_aliens/structures/special/pylon_core.dm
+++ b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -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)].\n\nWe will now grow more of our number from this pylon. 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 our numbers 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)
diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm
index d885e4d14a91..e4b021e98f46 100644
--- a/code/modules/cm_aliens/structures/trap.dm
+++ b/code/modules/cm_aliens/structures/trap.dm
@@ -145,7 +145,7 @@
clear_tripwires()
for(var/mob/living/carbon/xenomorph/X in GLOB.living_xeno_list)
if(X.hivenumber == hivenumber)
- to_chat(X, SPAN_XENOMINORWARNING("You sense one of your Hive's facehugger traps at [A.name] has been burnt!"))
+ to_chat(X, SPAN_XENOMINORWARNING("We sense one of our Hive's facehugger traps at [A.name] has been burnt!"))
/obj/effect/alien/resin/trap/proc/get_spray_type(level)
switch(level)
@@ -199,9 +199,9 @@
for(var/mob/living/carbon/xenomorph/X in GLOB.living_xeno_list)
if(X.hivenumber == hivenumber)
if(destroyed)
- to_chat(X, SPAN_XENOMINORWARNING("You sense one of your Hive's [trap_type_name] traps at [A.name] has been destroyed!"))
+ to_chat(X, SPAN_XENOMINORWARNING("We sense one of our Hive's [trap_type_name] traps at [A.name] has been destroyed!"))
else
- to_chat(X, SPAN_XENOMINORWARNING("You sense one of your Hive's [trap_type_name] traps at [A.name] has been triggered!"))
+ to_chat(X, SPAN_XENOMINORWARNING("We sense one of our Hive's [trap_type_name] traps at [A.name] has been triggered!"))
/obj/effect/alien/resin/trap/proc/clear_tripwires()
QDEL_NULL_LIST(tripwires)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
index e4f1d183f601..6d19a1b8feec 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
@@ -110,5 +110,5 @@
if (rav_shield && ((rav_shield.last_damage_taken + shield_decay_time) < world.time))
QDEL_NULL(rav_shield)
- to_chat(bound_xeno, SPAN_XENODANGER("You feel your shield decay!"))
+ to_chat(bound_xeno, SPAN_XENODANGER("We feel our shield decay!"))
bound_xeno.overlay_shields()
diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm
index e83955996349..c035dd255ce1 100644
--- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm
+++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm
@@ -1224,10 +1224,10 @@
if(!target_hive.living_xeno_queen && !target_hive.allow_no_queen_actions)
return
if(allies[faction])
- xeno_message(SPAN_XENOANNOUNCE("You sense that [name] [living_xeno_queen ? "Queen " : ""]set up an alliance with us!"), 3, target_hive.hivenumber)
+ xeno_message(SPAN_XENOANNOUNCE("We sense that [name] [living_xeno_queen ? "Queen " : ""]set up an alliance with us!"), 3, target_hive.hivenumber)
return
- xeno_message(SPAN_XENOANNOUNCE("You sense that [name] [living_xeno_queen ? "Queen " : ""]broke the alliance with us!"), 3, target_hive.hivenumber)
+ xeno_message(SPAN_XENOANNOUNCE("We sense that [name] [living_xeno_queen ? "Queen " : ""]broke the alliance with us!"), 3, target_hive.hivenumber)
if(target_hive.allies[name]) //autobreak alliance on betrayal
target_hive.change_stance(name, FALSE)
@@ -1254,14 +1254,14 @@
/datum/hive_status/corrupted/proc/give_defection_choice(mob/living/carbon/xenomorph/xeno, faction)
if(tgui_alert(xeno, "Your Queen has broken the alliance with the [faction]. The device inside your carapace begins to suppress your connection with the Hive. Do you remove it and stay loyal to her?", "Alliance broken!", list("Stay loyal", "Obey the talls"), 10 SECONDS) == "Obey the talls")
if(!xeno.iff_tag)
- to_chat(xeno, SPAN_XENOWARNING("It's too late now. The device is gone and your service to the Queen continues."))
+ to_chat(xeno, SPAN_XENOWARNING("It's too late now. The device is gone and our service to the Queen continues."))
return
defectors += xeno
xeno.set_hive_and_update(XENO_HIVE_RENEGADE)
to_chat(xeno, SPAN_XENOANNOUNCE("You lost the connection with your Hive. Now you have no Queen, only your masters."))
- to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(xeno.iff_tag.faction_groups, "no one")]."))
+ to_chat(xeno, SPAN_NOTICE("Our instincts have changed, we seem compelled to protect [english_list(xeno.iff_tag.faction_groups, "no one")]."))
return
- xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("You rip out [xeno.iff_tag]! For the Hive!"))
+ xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("We rip out [xeno.iff_tag]! For the Hive!"))
xeno.adjustBruteLoss(50)
xeno.iff_tag.forceMove(get_turf(xeno))
xeno.iff_tag = null
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
index 3b321ca259c9..10cbc29f51b0 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
@@ -102,7 +102,7 @@
plasma_use_per_tick = 15
action_start_message = "You start forming eggs."
- action_end_message = "You don't have enough plasma to support forming eggs."
+ action_end_message = "We don't have enough plasma to support forming eggs."
var/egg_generation_progress = 0
ability_primacy = XENO_PRIMARY_ACTION_3
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/vanguard.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/vanguard.dm
index 8e6fbd203805..d5ca8c4d6aad 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/vanguard.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/vanguard.dm
@@ -98,7 +98,7 @@
bound_xeno.explosivearmor_modifier += 1.5*XENO_EXPOSIVEARMOR_MOD_VERY_LARGE
bound_xeno.recalculate_armor()
new_shield.explosive_armor_amount = 1.5*XENO_EXPOSIVEARMOR_MOD_VERY_LARGE
- to_chat(praetorian, SPAN_XENOHIGHDANGER("You feel your defensive shell regenerate! It will block one hit!"))
+ to_chat(praetorian, SPAN_XENOHIGHDANGER("We feel our defensive shell regenerate! It will block one hit!"))
var/datum/action/xeno_action/activable/cleave/caction = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/cleave)
if (istype(caction))