Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

You/We fixes #5240

Merged
merged 4 commits into from
Dec 19, 2023
Merged

You/We fixes #5240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3deb0f9
fixes
Dec 17, 2023
be9d77a
Merge branch 'master' into weinsteaodfyoufixes
Red-byte3D Dec 17, 2023
c5aa0a4
more we
Dec 17, 2023
ff7e034
charger
Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/modules/cm_aliens/structures/egg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
if(status == EGG_BURST || status == EGG_DESTROYED)
M.animation_attack_on(src)
M.visible_message(SPAN_XENONOTICE("[M] clears the hatched egg."), \
SPAN_XENONOTICE("You clear the hatched egg."))
SPAN_XENONOTICE("We clear the hatched egg."))
playsound(src.loc, "alien_resin_break", 25)
qdel(src)
return XENO_NONCOMBAT_ACTION

if(M.hivenumber != hivenumber)
M.animation_attack_on(src)
M.visible_message(SPAN_XENOWARNING("[M] crushes \the [src]"),
SPAN_XENOWARNING("You crush \the [src]"))
SPAN_XENOWARNING("We crush \the [src]"))
Burst(TRUE)
return XENO_ATTACK_ACTION

Expand All @@ -70,9 +70,9 @@
return XENO_NO_DELAY_ACTION
if(EGG_GROWN)
if(islarva(M))
to_chat(M, SPAN_XENOWARNING("You nudge the egg, but nothing happens."))
to_chat(M, SPAN_XENOWARNING("We nudge the egg, but nothing happens."))
return
to_chat(M, SPAN_XENONOTICE("You retrieve the child."))
to_chat(M, SPAN_XENONOTICE("We retrieve the child."))
Burst(FALSE)
return XENO_NONCOMBAT_ACTION

Expand Down Expand Up @@ -186,7 +186,7 @@
if(EGG_BURST)
if(user)
visible_message(SPAN_XENOWARNING("[user] slides [F] back into [src]."), \
SPAN_XENONOTICE("You place the child back in to [src]."))
SPAN_XENONOTICE("We place the child back in to [src]."))
user.temp_drop_inv_item(F)
else
visible_message(SPAN_XENOWARNING("[F] crawls back into [src]!")) //Not sure how, but let's roll with it for now.
Expand Down
24 changes: 12 additions & 12 deletions code/modules/cm_aliens/structures/tunnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
//No teleporting!
return FALSE

to_chat(X, SPAN_XENONOTICE("You begin moving to your destination."))
to_chat(X, SPAN_XENONOTICE("We begin moving to our destination."))

var/tunnel_time = TUNNEL_MOVEMENT_XENO_DELAY

Expand All @@ -165,19 +165,19 @@
to_chat(X, SPAN_WARNING("The tunnel is too crowded, wait for others to exit!"))
return FALSE
if(!T.loc)
to_chat(X, SPAN_WARNING("The tunnel has collapsed before you reached its exit!"))
to_chat(X, SPAN_WARNING("The tunnel has collapsed before we reached its exit!"))
return FALSE

X.forceMove(T)
to_chat(X, SPAN_XENONOTICE("You have reached your destination."))
to_chat(X, SPAN_XENONOTICE("We have reached our destination."))
return TRUE

/obj/structure/tunnel/proc/exit_tunnel(mob/living/carbon/xenomorph/X)
. = FALSE //For peace of mind when it comes to dealing with unintended proc failures
if(X in contents)
X.forceMove(loc)
visible_message(SPAN_XENONOTICE("\The [X] pops out of the tunnel!"), \
SPAN_XENONOTICE("You pop out through the other side!"))
SPAN_XENONOTICE("We pop out through the other side!"))
return TRUE

//Used for controling tunnel exiting and returning
Expand All @@ -200,15 +200,15 @@

if(!isfriendly(M))
if(M.mob_size < MOB_SIZE_BIG)
to_chat(M, SPAN_XENOWARNING("You aren't large enough to collapse this tunnel!"))
to_chat(M, SPAN_XENOWARNING("We aren't large enough to collapse this tunnel!"))
return XENO_NO_DELAY_ACTION

M.visible_message(SPAN_XENODANGER("[M] begins to fill [src] with dirt."),\
SPAN_XENONOTICE("You begin to fill [src] with dirt using your massive claws."), max_distance = 3)
SPAN_XENONOTICE("We begin to fill [src] with dirt using our massive claws."), max_distance = 3)
xeno_attack_delay(M)

if(!do_after(M, 10 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL_OUT_OF_RANGE, max_dist = 1))
to_chat(M, SPAN_XENOWARNING("You decide not to cave the tunnel in."))
to_chat(M, SPAN_XENOWARNING("We decide not to cave the tunnel in."))
return XENO_NO_DELAY_ACTION

src.visible_message(SPAN_XENODANGER("[src] caves in!"), max_distance = 3)
Expand All @@ -217,7 +217,7 @@
return XENO_NO_DELAY_ACTION

if(M.anchored)
to_chat(M, SPAN_XENOWARNING("You can't climb through a tunnel while immobile."))
to_chat(M, SPAN_XENOWARNING("We can't climb through a tunnel while immobile."))
return XENO_NO_DELAY_ACTION

if(!hive.tunnels.len)
Expand All @@ -237,22 +237,22 @@

if(M.mob_size >= MOB_SIZE_BIG)
M.visible_message(SPAN_XENONOTICE("[M] begins heaving their huge bulk down into \the [src]."), \
SPAN_XENONOTICE("You begin heaving your monstrous bulk into \the [src]</b>."))
SPAN_XENONOTICE("We begin heaving our monstrous bulk into \the [src]</b>."))
else
M.visible_message(SPAN_XENONOTICE("\The [M] begins crawling down into \the [src]."), \
SPAN_XENONOTICE("You begin crawling down into \the [src]</b>."))
SPAN_XENONOTICE("We begin crawling down into \the [src]</b>."))

xeno_attack_delay(M)
if(!do_after(M, tunnel_time, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC))
to_chat(M, SPAN_WARNING("Your crawling was interrupted!"))
to_chat(M, SPAN_WARNING("Our crawling was interrupted!"))
return XENO_NO_DELAY_ACTION

if(hive.tunnels.len) //Make sure other tunnels exist
M.forceMove(src) //become one with the tunnel
to_chat(M, SPAN_HIGHDANGER("Alt + Click the tunnel to exit, Ctrl + Click to choose a destination."))
pick_tunnel(M)
else
to_chat(M, SPAN_WARNING("\The [src] ended unexpectedly, so you return back up."))
to_chat(M, SPAN_WARNING("\The [src] ended unexpectedly, so we return back up."))
return XENO_NO_DELAY_ACTION

/obj/structure/tunnel/maint_tunnel
Expand Down
16 changes: 8 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,21 @@
//Barricade collision
else if (istype(target, /obj/structure/barricade))
var/obj/structure/barricade/B = target
visible_message(SPAN_DANGER("[src] rams into [B] and skids to a halt!"), SPAN_XENOWARNING("You ram into [B] and skid to a halt!"))
visible_message(SPAN_DANGER("[src] rams into [B] and skids to a halt!"), SPAN_XENOWARNING("We ram into [B] and skid to a halt!"))

B.Collided(src)
. = FALSE

else if (istype(target, /obj/vehicle/multitile))
var/obj/vehicle/multitile/M = target
visible_message(SPAN_DANGER("[src] rams into [M] and skids to a halt!"), SPAN_XENOWARNING("You ram into [M] and skid to a halt!"))
visible_message(SPAN_DANGER("[src] rams into [M] and skids to a halt!"), SPAN_XENOWARNING("We ram into [M] and skid to a halt!"))

M.Collided(src)
. = FALSE

else if (istype(target, /obj/structure/machinery/m56d_hmg))
var/obj/structure/machinery/m56d_hmg/HMG = target
visible_message(SPAN_DANGER("[src] rams [HMG]!"), SPAN_XENODANGER("You ram [HMG]!"))
visible_message(SPAN_DANGER("[src] rams [HMG]!"), SPAN_XENODANGER("We ram [HMG]!"))
playsound(loc, "punch", 25, 1)
HMG.CrusherImpact()
. = FALSE
Expand Down Expand Up @@ -132,7 +132,7 @@

else if (istype(target, /obj/structure/machinery/defenses))
var/obj/structure/machinery/defenses/DF = target
visible_message(SPAN_DANGER("[src] rams [DF]!"), SPAN_XENODANGER("You ram [DF]!"))
visible_message(SPAN_DANGER("[src] rams [DF]!"), SPAN_XENODANGER("We ram [DF]!"))

if (!DF.unacidable)
playsound(loc, "punch", 25, 1)
Expand All @@ -148,7 +148,7 @@
if (V.unslashable)
. = FALSE
else
visible_message(SPAN_DANGER("[src] smashes straight into [V]!"), SPAN_XENODANGER("You smash straight into [V]!"))
visible_message(SPAN_DANGER("[src] smashes straight into [V]!"), SPAN_XENODANGER("We smash straight into [V]!"))
playsound(loc, "punch", 25, 1)
V.tip_over()

Expand All @@ -165,7 +165,7 @@
if (V.unslashable)
. = FALSE
else
visible_message(SPAN_DANGER("[src] smashes straight into [V]!"), SPAN_XENODANGER("You smash straight into [V]!"))
visible_message(SPAN_DANGER("[src] smashes straight into [V]!"), SPAN_XENODANGER("We smash straight into [V]!"))
playsound(loc, "punch", 25, 1)
V.tip_over()

Expand All @@ -184,7 +184,7 @@
if (O.unacidable)
. = FALSE
else if (O.anchored)
visible_message(SPAN_DANGER("[src] crushes [O]!"), SPAN_XENODANGER("You crush [O]!"))
visible_message(SPAN_DANGER("[src] crushes [O]!"), SPAN_XENODANGER("We crush [O]!"))
if(O.contents.len) //Hopefully won't auto-delete things inside crushed stuff.
var/turf/T = get_turf(src)
for(var/atom/movable/S in T.contents) S.forceMove(T)
Expand All @@ -195,7 +195,7 @@
else
if(O.buckled_mob)
O.unbuckle()
visible_message(SPAN_WARNING("[src] knocks [O] aside!"), SPAN_XENOWARNING("You knock [O] aside.")) //Canisters, crates etc. go flying.
visible_message(SPAN_WARNING("[src] knocks [O] aside!"), SPAN_XENOWARNING("We knock [O] aside.")) //Canisters, crates etc. go flying.
playsound(loc, "punch", 25, 1)

var/impact_range = 2
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
var/obj/structure/mineral_door/resin/resin_door = target_atom
resin_door.TryToSwitchState(owner)
if(resin_door.state)
to_chat(owner, SPAN_XENONOTICE("You focus your connection to the resin and remotely close the resin door."))
to_chat(owner, SPAN_XENONOTICE("We focus our connection to the resin and remotely close the resin door."))
else
to_chat(owner, SPAN_XENONOTICE("You focus your connection to the resin and remotely open the resin door."))
to_chat(owner, SPAN_XENONOTICE("We focus our connection to the resin and remotely open the resin door."))
return

// since actions are instanced per hivelord, and only one construction can be made at a time, tweaking the datum on the fly here is fine. you're going to have to figure something out if these conditions change, though
Expand All @@ -111,7 +111,7 @@

var/datum/resin_construction/resing_construction = GLOB.resin_constructions_list[hivelord.selected_resin]
target_turf.visible_message(SPAN_XENONOTICE("The weeds begin pulsating wildly and secrete resin in the shape of \a [resing_construction.construction_name]!"), null, 5)
to_chat(owner, SPAN_XENONOTICE("You focus your plasma into the weeds below you and force the weeds to secrete resin in the shape of \a [resing_construction.construction_name]."))
to_chat(owner, SPAN_XENONOTICE("We focus our plasma into the weeds below us and force the weeds to secrete resin in the shape of \a [resing_construction.construction_name]."))
playsound(target_turf, "alien_resin_build", 25)
return TRUE

Expand Down