Skip to content

Commit

Permalink
Changes hit alerts from you to WE (#5295)
Browse files Browse the repository at this point in the history
# About the pull request
This makes you are hit by x to We for the xeno side

i dont know if this is a good way to do this, however.
# Explain why it's good for the game

Consistency is good, also more hiveminded alerts

# Testing Photographs and Procedure
text based

# Changelog

:cl:
spellcheck: Changed hit alerts to We instead of You on the xeno side.
/:cl:

---------

Co-authored-by: InsaneRed <[email protected]>
  • Loading branch information
Red-byte3D and InsaneRed committed Dec 31, 2023
1 parent 9d9139a commit 988a56a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
14 changes: 7 additions & 7 deletions code/modules/mob/living/carbon/human/powers/human_powers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
if(new_resting == resting)
return
if(!COOLDOWN_FINISHED(src, rest_cooldown))
to_chat(src, SPAN_WARNING("You can't 'rest' that fast. Take a breather!"))
to_chat(src, SPAN_WARNING("[isxeno(src) ? "We" : "You"] can't 'rest' that fast. Take a breather!"))
return
COOLDOWN_START(src, rest_cooldown, 1 SECONDS)

Expand All @@ -211,24 +211,24 @@
if(new_resting)
if(body_position == LYING_DOWN)
if(!silent)
to_chat(src, SPAN_NOTICE("You will now try to stay lying down on the floor."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] will now try to stay lying down on the floor."))
else if(HAS_TRAIT(src, TRAIT_FORCED_STANDING) || (buckled && buckled.buckle_lying != NO_BUCKLE_LYING))
if(!silent)
to_chat(src, SPAN_NOTICE("You will now lay down as soon as you are able to."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] will now lay down as soon as [isxeno(src) ? "we" : "you"] are able to."))
else
if(!silent)
to_chat(src, SPAN_NOTICE("You lay down."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] lay down."))
set_lying_down()
else
if(body_position == STANDING_UP)
if(!silent)
to_chat(src, SPAN_NOTICE("You will now try to remain standing up."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] will now try to remain standing up."))
else if(HAS_TRAIT(src, TRAIT_FLOORED) || (buckled && buckled.buckle_lying != NO_BUCKLE_LYING))
if(!silent)
to_chat(src, SPAN_NOTICE("You will now stand up as soon as you are able to."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] will now stand up as soon as [isxeno(src) ? "we" : "you"] are able to."))
else
if(!silent)
to_chat(src, SPAN_NOTICE("You stand up."))
to_chat(src, SPAN_NOTICE("[isxeno(src) ? "We" : "You"] stand up."))
get_up(instant)

// SEND_SIGNAL(src, COMSIG_LIVING_RESTING, new_resting, silent, instant)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -313,4 +313,4 @@
fire.set_on_fire(src) //Deals an extra proc of fire when you're crossing it. 30 damage per tile crossed, plus 15 per Process().
next_move_slowdown = next_move_slowdown + (SLOWDOWN_AMT_GREENFIRE * resist_modifier)
if(resist_modifier > 0)
to_chat(src, SPAN_DANGER("You feel pieces of your exoskeleton fusing with the viscous fluid below and tearing off as you struggle to move through the flames!"))
to_chat(src, SPAN_DANGER("We feel pieces of our exoskeleton fusing with the viscous fluid below and tearing off as we struggle to move through the flames!"))
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/flamer/flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@
burn_damage = 0

if(!burn_damage)
to_chat(M, SPAN_DANGER("You step over the flames."))
to_chat(M, SPAN_DANGER("[isxeno(M) ? "We" : "You"] step over the flames."))
return

M.last_damage_data = weapon_cause_data
Expand All @@ -632,7 +632,7 @@
if(FIRE_VARIANT_TYPE_B)
if(isxeno(M))
var/mob/living/carbon/xenomorph/X = M
X.armor_deflection?(variant_burn_msg=" You feel the flames weakening your exoskeleton!"):(variant_burn_msg=" You feel the flaming chemicals eating into your body!")
X.armor_deflection?(variant_burn_msg=" We feel the flames weakening our exoskeleton!"):(variant_burn_msg=" You feel the flaming chemicals eating into your body!")
to_chat(M, SPAN_DANGER("You are burned![variant_burn_msg?"[variant_burn_msg]":""]"))
M.updatehealth()

Expand Down
3 changes: 2 additions & 1 deletion code/modules/projectiles/projectile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,10 @@
return
if(COOLDOWN_FINISHED(src, shot_cooldown))
visible_message(SPAN_DANGER("[src] is hit by the [P.name] in the [parse_zone(P.def_zone)]!"), \
SPAN_HIGHDANGER("You are hit by the [P.name] in the [parse_zone(P.def_zone)]!"), null, 4, CHAT_TYPE_TAKING_HIT)
SPAN_HIGHDANGER("[isxeno(src) ? "We" : "You"] are hit by the [P.name] in the [parse_zone(P.def_zone)]!"), null, 4, CHAT_TYPE_TAKING_HIT)
COOLDOWN_START(src, shot_cooldown, 1 SECONDS)


last_damage_data = P.weapon_cause_data
if(P.firer && ismob(P.firer))
var/mob/firingMob = P.firer
Expand Down

0 comments on commit 988a56a

Please sign in to comment.