Skip to content

Commit

Permalink
Replaces all instances of highdanger with userdanger, and updates tgu…
Browse files Browse the repository at this point in the history
…i-chat constants (#16818)
  • Loading branch information
Neocloudy authored Dec 22, 2024
1 parent b2e879e commit 40b8df6
Show file tree
Hide file tree
Showing 37 changed files with 73 additions and 84 deletions.
3 changes: 1 addition & 2 deletions code/__DEFINES/span.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#define span_greentext(str) ("<span class='greentext'>" + str + "</span>")
#define span_grippy(str) ("<span class='grippy'>" + str + "</span>")
#define span_hear(str) ("<span class='hear'>" + str + "</span>")
#define span_highdanger(str) ("<span class='highdanger'>" + str + "</span>")
#define span_info(str) ("<span class='info'>" + str + "</span>")
#define span_infoplain(str) ("<span class='infoplain'>" + str + "</span>")
#define span_information(str) ("<span class='information'>" + str + "</span>")
Expand Down Expand Up @@ -80,8 +79,8 @@
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_xenoannounce(str) ("<span class='xenoannounce'>" + str + "</span>")
#define span_xenodanger(str) ("<span class='xenodanger'>" + str + "</span>")
#define span_xenohighdanger(str) ("<span class='xenohighdanger'>" + str + "</span>")
#define span_xenonotice(str) ("<span class='xenonotice'>" + str + "</span>")
#define span_xenouserdanger(str) ("<span class='xenouserdanger'>" + str + "</span>")
#define span_xenowarning(str) ("<span class='xenowarning'>" + str + "</span>")
#define span_yell(str) ("<span class='yell'>" + str + "</span>")
#define span_deptradio(str) ("<span class='deptradio'>" + str + "</span>")
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/chem_booster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
to_chat(wearer, span_bold("WARNING: You have [(200 - (vali_necro_timer))/10] seconds before necrotic tissue forms on your limbs."))
if(vali_necro_timer > 15 SECONDS)
wearer.overlay_fullscreen("degeneration", /atom/movable/screen/fullscreen/animated/infection, 1)
to_chat(wearer, span_highdanger("The process of necrosis begins to set in. Turn it off before it's too late!"))
to_chat(wearer, span_userdanger("The process of necrosis begins to set in. Turn it off before it's too late!"))

/**
* Opens the radial menu with everything
Expand Down
2 changes: 1 addition & 1 deletion code/datums/gamemodes/campaign/faction_stats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list(
for(var/mob/living/carbon/human/human AS in GLOB.alive_human_list_faction[faction])
human.playsound_local(null, 'sound/effects/CIC_order.ogg', 30, 1)
human.play_screen_text("<span class='maptext' style=font-size:24pt;text-align:left valign='top'><u>OVERWATCH</u></span><br>" + "[faction_leader] has been promoted to the role of faction commander", faction_portrait)
to_chat(faction_leader, span_highdanger("You have been promoted to the role of commander for your faction. It is your responsibility to determine your side's course of action, and how to best utilise the resources at your disposal. \
to_chat(faction_leader, span_userdanger("You have been promoted to the role of commander for your faction. It is your responsibility to determine your side's course of action, and how to best utilise the resources at your disposal. \
Attrition must be set BEFORE a mission starts ensure you team has access to respawns. Check this in the Faction UI screen. \
You are the only one that can choose the next mission for your faction. If your faction wins a mission, select the next one in the Faction UI screen, in the Missions tab."))

Expand Down
4 changes: 2 additions & 2 deletions code/datums/jobs/job/sonsofmars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
. = ..()
if(istype(SSticker.mode, /datum/game_mode/hvh/combat_patrol))
if(issensorcapturegamemode(SSticker.mode))
to_chat(M, span_highdanger("Your platoon has orders to defend sensor towers in the AO and prevent them from reactivation by TerraGov forces until heavy reeinforcement arrives. High Command considers the successful prevention of the reactivation of the sensor towers a major victory"))
to_chat(M, span_userdanger("Your platoon has orders to defend sensor towers in the AO and prevent them from reactivation by TerraGov forces until heavy reeinforcement arrives. High Command considers the successful prevention of the reactivation of the sensor towers a major victory"))
else
to_chat(M, span_highdanger("Your platoon has orders to patrol a remote territory illegally claimed by TerraGov imperialists. Intel suggests TGMC units are similarly trying to press their claims by force. Work with your team and eliminate all TGMC you encounter while preserving your own strength! High Command considers wiping out all enemies a major victory, or inflicting more casualties a minor victory."))
to_chat(M, span_userdanger("Your platoon has orders to patrol a remote territory illegally claimed by TerraGov imperialists. Intel suggests TGMC units are similarly trying to press their claims by force. Work with your team and eliminate all TGMC you encounter while preserving your own strength! High Command considers wiping out all enemies a major victory, or inflicting more casualties a minor victory."))
return

/datum/job/som/squad/after_spawn(mob/living/carbon/C, mob/M, latejoin = FALSE)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/jobs/job/terragov.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
. = ..()
if(istype(SSticker.mode, /datum/game_mode/hvh/combat_patrol))
if(issensorcapturegamemode(SSticker.mode))
to_chat(M, span_highdanger("Your platoon has orders to attack sensor towers in the AO and reactivate them in order to alert other TerraGov forces in the sector about the invasion. High Command considers the successful reactivation of the sensor towers a major victory"))
to_chat(M, span_userdanger("Your platoon has orders to attack sensor towers in the AO and reactivate them in order to alert other TerraGov forces in the sector about the invasion. High Command considers the successful reactivation of the sensor towers a major victory"))
else
to_chat(M, span_highdanger("Your platoon has orders to patrol a remote TerraGov territory that the Sons of Mars are illegally attempting to claim. Intel suggests hostile patrols are in the area to try maintain defacto control. Work with your team and eliminate all SOM you encounter while minimising your own casualties! High Command considers wiping out all enemies a major victory, or inflicting more casualties a minor victory."))
to_chat(M, span_userdanger("Your platoon has orders to patrol a remote TerraGov territory that the Sons of Mars are illegally attempting to claim. Intel suggests hostile patrols are in the area to try maintain defacto control. Work with your team and eliminate all SOM you encounter while minimising your own casualties! High Command considers wiping out all enemies a major victory, or inflicting more casualties a minor victory."))
return
if(CONFIG_GET(number/minimal_access_threshold))
var/msg = "As this ship was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "skeleton crew, additional access may" : "full crew, only the job's necessities"] have been added to the crew's ID cards."
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_types/acid_rain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
desc = "The planet's thunderstorms are by nature acidic, and will incinerate anyone standing beneath them without protection."

telegraph_duration = 400
telegraph_message = span_highdanger("Thunder rumbles far above. You hear acidic droplets hissing against the canopy. Seek shelter!")
telegraph_message = span_userdanger("Thunder rumbles far above. You hear acidic droplets hissing against the canopy. Seek shelter!")
telegraph_overlay = "rain_med"
telegraph_sound = 'sound/effects/siren.ogg'

weather_message = span_highdanger("<i>Acidic rain pours down around you! Get inside!</i>")
weather_message = span_userdanger("<i>Acidic rain pours down around you! Get inside!</i>")
weather_overlay = "acid_rain"
weather_duration_lower = 600
weather_duration_upper = 1500
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_types/ash_storm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
name = "ash storm"
desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected."

telegraph_message = span_highdanger("An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter.")
telegraph_message = span_userdanger("An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter.")
telegraph_duration = 300
telegraph_overlay = "light_ash"

weather_message = span_highdanger("<i>Smoldering clouds of scorching ash billow down around you! Get inside!</i>")
weather_message = span_userdanger("<i>Smoldering clouds of scorching ash billow down around you! Get inside!</i>")
weather_duration_lower = 600
weather_duration_upper = 1200
weather_overlay = "ash_storm"
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_types/sand_storm.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//Darude sandstorm starts playing
/datum/weather/ash_storm/sand
name = "severe sandstorm"
telegraph_message = span_highdanger("You see a dust cloud rising over the horizon. That can't be good...")
telegraph_message = span_userdanger("You see a dust cloud rising over the horizon. That can't be good...")
telegraph_duration = 300
telegraph_overlay = "dust_med"
telegraph_sound = 'sound/effects/siren.ogg'

weather_message = span_highdanger("<i>Hot sand and wind batter you! Get inside!</i>")
weather_message = span_userdanger("<i>Hot sand and wind batter you! Get inside!</i>")
weather_duration_lower = 600
weather_duration_upper = 1200
weather_overlay = "dust_high"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/radio/detpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
return

if(prob((SKILL_ENGINEER_METAL - user.skills.getRating(SKILL_ENGINEER)) * 20))
to_chat(user, span_highdanger("After several seconds of your clumsy meddling the [src] buzzes angrily as if offended. You have a <b>very</b> bad feeling about this."))
to_chat(user, span_userdanger("After several seconds of your clumsy meddling the [src] buzzes angrily as if offended. You have a <b>very</b> bad feeling about this."))
timer = 0 //Oops. Now you fucked up. Immediate detonation.

user.visible_message(span_notice("[user] begins disarming [src] with [I]."),
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/fun_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1100,19 +1100,19 @@
var/choice = tgui_input_list(usr, "What would you like to set gravity to?", "Gravity adjustment", list("Standard gravity", "Low gravity", "John Woo", "Exceeding orbital velocity"))
switch(choice)
if("Standard gravity")
to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity return to normal."))
to_chat(GLOB.mob_living_list, span_userdanger("You feel gravity return to normal."))
for(var/mob/living/living_mob AS in GLOB.mob_living_list)
living_mob.set_jump_component()
if("Low gravity")
to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity pull gently at you."))
to_chat(GLOB.mob_living_list, span_userdanger("You feel gravity pull gently at you."))
for(var/mob/living/living_mob AS in GLOB.mob_living_list)
living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 32, jump_pass_flags = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_DEFENSIVE_STRUCTURE|PASS_TANK)
if("John Woo")
to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity grow weak, and the urge to fly."))
to_chat(GLOB.mob_living_list, span_userdanger("You feel gravity grow weak, and the urge to fly."))
for(var/mob/living/living_mob AS in GLOB.mob_living_list)
living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 48, sound = SFX_JUMP, flags = JUMP_SPIN, jump_pass_flags = HOVERING|PASS_PROJECTILE|PASS_TANK)
if("Exceeding orbital velocity")
to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity fade to nothing. Will you even come back down?"))
to_chat(GLOB.mob_living_list, span_userdanger("You feel gravity fade to nothing. Will you even come back down?"))
for(var/mob/living/living_mob AS in GLOB.mob_living_list)
living_mob.set_jump_component(duration = 4 SECONDS, cooldown = 6 SECONDS, cost = 0, height = 128, sound = SFX_JUMP, flags = JUMP_SPIN, jump_pass_flags = HOVERING|PASS_PROJECTILE|PASS_TANK)
else
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,28 +262,28 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
if("gethumans")
log_admin("[key_name(usr)] mass-teleported all humans.")
message_admins("[ADMIN_TPMONTY(usr)] mass-teleported all humans.")
to_chat(GLOB.alive_human_list, span_highdanger("[key_name_admin(usr, FALSE)] mass-teleported all humans."))
to_chat(GLOB.alive_human_list, span_userdanger("[key_name_admin(usr, FALSE)] mass-teleported all humans."))
for(var/i in GLOB.alive_human_list)
var/mob/M = i
M.forceMove(T)
if("getxenos")
log_admin("[key_name(usr)] mass-teleported all Xenos.")
message_admins("[ADMIN_TPMONTY(usr)] mass-teleported all Xenos.")
to_chat(GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL], span_highdanger("[key_name_admin(usr, FALSE)] mass-teleported all xenos."))
to_chat(GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL], span_userdanger("[key_name_admin(usr, FALSE)] mass-teleported all xenos."))
for(var/i in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
var/mob/M = i
M.forceMove(T)
if("getall")
log_admin("[key_name(usr)] mass-teleported everyone.")
message_admins("[ADMIN_TPMONTY(usr)] mass-teleported everyone.")
to_chat(GLOB.mob_living_list, span_highdanger("[key_name_admin(usr, FALSE)] mass-teleported everyone."))
to_chat(GLOB.mob_living_list, span_userdanger("[key_name_admin(usr, FALSE)] mass-teleported everyone."))
for(var/i in GLOB.mob_living_list)
var/mob/M = i
M.forceMove(T)
if("rejuvall")
log_admin("[key_name(usr)] mass-rejuvenated cliented mobs.")
message_admins("[ADMIN_TPMONTY(usr)] mass-rejuvenated cliented mobs.")
to_chat(GLOB.mob_living_list, span_highdanger("[key_name_admin(usr, FALSE)] mass-rejuvenated everyone."))
to_chat(GLOB.mob_living_list, span_userdanger("[key_name_admin(usr, FALSE)] mass-rejuvenated everyone."))
for(var/i in GLOB.mob_living_list)
var/mob/living/L = i
if(!L.client)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
return

if(IsAdminSleeping())
to_chat(shaker, span_highdanger("This player has been admin slept, do not interfere with them."))
to_chat(shaker, span_userdanger("This player has been admin slept, do not interfere with them."))
return

if(lying_angle || IsSleeping())
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@

if(has_status_effect(STATUS_EFFECT_ADMINSLEEP))
msg += separator_hr("[span_boldwarning("Admin Slept")]")
msg += span_highdanger("This player has been slept by staff. Best to leave them be.\n")
msg += span_userdanger("This player has been slept by staff. Best to leave them be.\n")

msg += "</span>"
return list(msg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
SSblackbox.record_feedback("tally", "round_statistics", 1, "crusher_stomp_victims")
M.take_overall_damage(damage, BRUTE, MELEE, updating_health = TRUE, max_limbs = 3)
M.Paralyze(3 SECONDS)
to_chat(M, span_highdanger("You are stomped on by [X]!"))
to_chat(M, span_userdanger("You are stomped on by [X]!"))
shake_camera(M, 3, 3)
else
step_away(M, X, 1) //Knock away
shake_camera(M, 2, 2)
to_chat(M, span_highdanger("You reel from the shockwave of [X]'s stomp!"))
to_chat(M, span_userdanger("You reel from the shockwave of [X]'s stomp!"))
M.take_overall_damage(damage, BRUTE, MELEE, updating_health = TRUE, max_limbs = 3)
M.Paralyze(0.5 SECONDS)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
if(50 to 99)
to_chat(living_target, span_danger("Your insides are in agony!"))
if(100 to INFINITY)
to_chat(living_target, span_highdanger("YOUR INSIDES FEEL LIKE THEY'RE ON FIRE!!"))
to_chat(living_target, span_userdanger("YOUR INSIDES FEEL LIKE THEY'RE ON FIRE!!"))

GLOB.round_statistics.defiler_defiler_stings++
SSblackbox.record_feedback("tally", "round_statistics", 1, "defiler_defiler_stings")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,13 @@
personal_statistics.heals++
else if(distance == 0) //if we're right on top of them, they take actual damage
M.take_overall_damage(20, BRUTE, MELEE, updating_health = TRUE, max_limbs = 3)
to_chat(M, span_highdanger("[owner_xeno] slams her fists into you, crushing you to the ground!"))
to_chat(M, span_userdanger("[owner_xeno] slams her fists into you, crushing you to the ground!"))
M.adjust_stagger(2 SECONDS)
M.adjust_slowdown(3)
shake_camera(M, 3, 3)
else if(distance <= 1) //marines will only be staggerslowed if they're one tile away from you
shake_camera(M, 2, 2)
to_chat(M, span_highdanger("Blood shatters the ground around you!"))
to_chat(M, span_userdanger("Blood shatters the ground around you!"))
M.adjust_stagger(2 SECONDS)
M.adjust_slowdown(3)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
if(isnull(our_parent))
return ..()
our_parent.playsound_local(our_parent, SFX_ALIEN_HELP, 30, TRUE)
to_chat(our_parent, span_xenohighdanger("Your core has been destroyed!"))
to_chat(our_parent, span_xenouserdanger("Your core has been destroyed!"))
xeno_message("A sudden tremor ripples through the hive... \the [our_parent] has been slain!", "xenoannounce", 5, our_parent.hivenumber)
GLOB.key_to_time_of_role_death[our_parent.key] = world.time
GLOB.key_to_time_of_death[our_parent.key] = world.time
Expand Down Expand Up @@ -371,7 +371,7 @@
var/health_percent = round((max_integrity / obj_integrity) * 100)
switch(health_percent)
if(-INFINITY to 25)
to_chat(our_parent, span_xenohighdanger("Your core is under attack, and dangerous low on health!"))
to_chat(our_parent, span_xenouserdanger("Your core is under attack, and dangerous low on health!"))
if(26 to 75)
to_chat(our_parent, span_xenodanger("Your core is under attack, and low on health!"))
if(76 to INFINITY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj
var/mob/living/carbon/carbon_victim = living_target
carbon_victim.ParalyzeNoChain(0.5 SECONDS)

to_chat(carbon_victim, span_highdanger("The [owner] tackles us, sending us behind them!"))
to_chat(carbon_victim, span_userdanger("The [owner] tackles us, sending us behind them!"))
owner.visible_message(span_xenodanger("\The [owner] tackles [carbon_victim], swapping location with them!"), \
span_xenodanger("We push [carbon_victim] in our acid trail!"), visible_message_flags = COMBAT_MESSAGE)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
add_cooldown()

playsound(xeno_owner.loc, 'sound/voice/alien/queen_screech.ogg', 75, 0)
xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
xeno_owner.visible_message(span_xenouserdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
GLOB.round_statistics.queen_screech++
SSblackbox.record_feedback("tally", "round_statistics", 1, "queen_screech")
xeno_owner.create_shriekwave() // Adds the visual effect. Wom wom wom.
Expand Down Expand Up @@ -123,7 +123,7 @@
affected_xeno.apply_status_effect(/datum/status_effect/healing_infusion, HIVELORD_HEALING_INFUSION_DURATION / 2, HIVELORD_HEALING_INFUSION_TICKS / 2)

playsound(xeno_owner.loc, 'sound/voice/alien/queen_heal_screech.ogg', 75, 0)
xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
xeno_owner.visible_message(span_xenouserdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
if("plasma_screech")
succeed_activate()
add_cooldown(30 SECONDS)
Expand All @@ -135,7 +135,7 @@
affected_xeno.apply_status_effect(/datum/status_effect/plasma_surge, affected_xeno.xeno_caste.plasma_max / 2, 0.5, 30 SECONDS)

playsound(xeno_owner.loc, 'sound/voice/alien/queen_plasma_screech.ogg', 75, 0)
xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
xeno_owner.visible_message(span_xenouserdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
if("frenzy_screech")
succeed_activate()
add_cooldown(30 SECONDS)
Expand All @@ -147,7 +147,7 @@
affected_xeno.apply_status_effect(/datum/status_effect/frenzy_screech)

playsound(xeno_owner.loc, 'sound/voice/alien/queen_frenzy_screech.ogg', 75, 0)
xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))
xeno_owner.visible_message(span_xenouserdanger("\The [xeno_owner] emits an ear-splitting guttural roar!"))

/datum/action/ability/activable/xeno/screech/alternate_action_activate()
var/mob/living/carbon/xenomorph/queen/xeno_owner = owner
Expand Down
Loading

0 comments on commit 40b8df6

Please sign in to comment.