Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Cleaning up/fixing a lot of bad "send to world" code #14134

Merged
JamieD1 merged 4 commits into from
May 22, 2022
Merged

Cleaning up/fixing a lot of bad "send to world" code #14134

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
ffb7bb5
dchat broadcast proper
ynot01 May 13, 2022
ba4de6a
cleaning up bad "send to world" code
ynot01 May 13, 2022
cdc6bc1
would have spammed dchat 50 times
ynot01 May 13, 2022
24d1b80
debug_admins instead of debug_world
ynot01 May 13, 2022
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
2 changes: 1 addition & 1 deletion code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@

/obj/item/toy/plush/proc/heartbreak(obj/item/toy/plush/Brutus)
if(lover != Brutus)
to_chat(world, "lover != Brutus")
debug_admins("lover != Brutus")
return //why are we considering someone we don't love?

scorned.Add(Brutus)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
return
clashing = TRUE
GLOB.cult_narsie.clashing = TRUE
to_chat(world, "<span class='bold brass'><font size=5>\"YOU.\"</font></span>")
to_chat(world, "<span class='bold cult'><font size=5>\"Ratvar?!\"</font></span>")
send_to_playing_players("<span class='bold brass'><font size=5>\"YOU.\"</font></span>")
send_to_playing_players("<span class='bold cult'><font size=5>\"Ratvar?!\"</font></span>")
clash_of_the_titans(GLOB.cult_narsie) // >:(
return TRUE

Expand Down
6 changes: 3 additions & 3 deletions code/modules/security_levels/security_levels.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)

if(SEC_LEVEL_GAMMA)
minor_announce(CONFIG_GET(string/alert_gamma), "Attention! Gamma security level activated!", TRUE)
SEND_SOUND(world, 'sound/misc/gamma_alert.ogg')
sound_to_playing_players('sound/misc/gamma_alert.ogg')
if(GLOB.security_level == SEC_LEVEL_GREEN)
modTimer = 0.25
else if(GLOB.security_level == SEC_LEVEL_BLUE)
Expand All @@ -66,8 +66,8 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)

if(SEC_LEVEL_EPSILON)
minor_announce(CONFIG_GET(string/alert_epsilon), "Attention! Epsilon security level reached!", TRUE)
SEND_SOUND(world, 'sound/misc/epsilon_alert.ogg')
to_chat(world, span_notice("You get a bad feeling as you hear the Epsilon alert siren."))
sound_to_playing_players('sound/misc/epsilon_alert.ogg')
send_to_playing_players(span_notice("You get a bad feeling as you hear the Epsilon alert siren."))
if(GLOB.security_level < SEC_LEVEL_EPSILON)
modTimer = 1

Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/admin/admin_verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
var/fluff_revive = pick("revive","rejuvenate","rekindle","renew","restore","resuscitate","revitalize","repair")
var/fluff_everyone = pick("everyone","every single one of you","the populace","the masses","each person","anybody and everybody","every player","all the greytiders","all the wonderful individuals")

to_chat(world, "<b>[fluff_the] [fluff_adjective] [fluff_admins] have [fluff_decide] to [fluff_adverb] [fluff_revive] [fluff_everyone]. :)</b>")
send_to_playing_players("<b>[fluff_the] [fluff_adjective] [fluff_admins] have [fluff_decide] to [fluff_adverb] [fluff_revive] [fluff_everyone]. :)</b>")
message_admins("[src] revived [revive_count] mobs.")
log_admin("[src] revived [revive_count] mobs.")

Expand Down
9 changes: 3 additions & 6 deletions yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,9 @@
H.do_jitter_animation(1000)
var/processed_message = span_velvet("<b>\[Mindlink\] [H.real_name] has not divulged in time and is now forcefully divulging.</b>")
for(var/mob/M in GLOB.player_list)
if(M.stat == DEAD)
var/link = FOLLOW_LINK(M, H)
to_chat(M, "[link] [processed_message]")
else if(isdarkspawn(M))
if(M.stat != DEAD && isdarkspawn(M))
to_chat(M, processed_message)
deadchat_broadcast(processed_message, null, H)
addtimer(CALLBACK(src, .proc/divulge), 25)
addtimer(CALLBACK(/atom/.proc/visible_message, H, span_boldwarning("[H]'s skin sloughs off, revealing black flesh covered in symbols!"), \
span_userdanger("You have forcefully divulged!")), 25)
Expand Down Expand Up @@ -369,8 +367,7 @@
addtimer(CALLBACK(src, .proc/sacrament_shuttle_call), 50)
for(var/V in abilities)
remove_ability(abilities[V], TRUE)
for(var/mob/M in GLOB.player_list)
M.playsound_local(M, 'yogstation/sound/magic/sacrament_complete.ogg', 70, FALSE, pressure_affected = FALSE)
sound_to_playing_players('yogstation/sound/magic/sacrament_complete.ogg', 70, FALSE, pressure_affected = FALSE)
psi = 9999
psi_cap = 9999
psi_regen = 9999
Expand Down
4 changes: 2 additions & 2 deletions yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@

/mob/living/simple_animal/ascendant_shadowling/singularity_act()
to_chat(src, "<span class='shadowling>NO NO NO AAAAAAAAAAAAAAAAAAA-</span>")
to_chat(world, span_shadowling("<b>\"<font size=6>NO!</font> <font size=5>I will</font> <font size=4>not be.... destroyed</font> <font size=3>by a....</font> <font size=2>AAAAAAA-</font>\""))
send_to_playing_players(span_shadowling("<b>\"<font size=6>NO!</font> <font size=5>I will</font> <font size=4>not be.... destroyed</font> <font size=3>by a....</font> <font size=2>AAAAAAA-</font>\""))
for(var/X in GLOB.alive_mob_list)
var/mob/M = X
to_chat(M, span_notice("<i><b>You feel a woosh as newly released energy temporarily distorts space itself...</b></i>"))
SEND_SOUND(M, sound('sound/hallucinations/wail.ogg'))
sound_to_playing_players('sound/hallucinations/wail.ogg') // Ghosts have ears!!
. = ..()
5 changes: 2 additions & 3 deletions yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@
for(var/mob/living/M in orange(7, H))
M.Knockdown(10)
to_chat(M, span_userdanger("An immense pressure slams you onto the ground!"))
to_chat(world, "<font size=5><span class='shadowling'><b>\"VYSHA NERADA YEKHEZET U'RUU!!\"</font></span>")
for(var/mob/M in GLOB.player_list)
SEND_SOUND(M, sound('sound/hallucinations/veryfar_noise.ogg'))
send_to_playing_players("<font size=5><span class='shadowling'><b>\"VYSHA NERADA YEKHEZET U'RUU!!\"</font></span>")
sound_to_playing_players('sound/hallucinations/veryfar_noise.ogg')
for(var/obj/machinery/power/apc/A in GLOB.apcs_list)
A.overload_lighting()
SSachievements.unlock_achievement(/datum/achievement/greentext/slingascend, H.client)
Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/guardian/abilities/special/pocket.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors)
. = ..()
var/datum/space_level/level = SSmapping.get_level(z)
if (!level)
to_chat(world, "uh oh, stinky!!")
debug_admins("uh oh, stinky!!")
return INITIALIZE_HINT_QDEL
GLOB.pocket_corners[level.name] = list(
"bl-corner" = get_turf(src), // Bottom left corner
Expand Down