Revert #25303 and subsequent fixes (#25613)

* Revert "Be safe, radios. (#25595)"

This reverts commit bfa88abd5a.

* Revert "Fixes various radio issues (#25586)"

This reverts commit 9296564ab6.

* Revert "refactors radios to use proximity (#25303)"

This reverts commit 06db6bc004.

* One more bit that needed reverting.

* Begone, unnecessary file!

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
This commit is contained in:
Charlie Nolan
2024-05-23 21:42:53 -07:00
committed by GitHub
parent 03cca11f95
commit 82a1cc6a4e
8 changed files with 52 additions and 89 deletions
@@ -1048,9 +1048,6 @@
if("ghost_radio")
toggles ^= PREFTOGGLE_CHAT_GHOSTRADIO
if(isobserver(user))
var/mob/dead/observer/dead_dude = user
dead_dude.update_dead_radio()
if("ghost_pda")
toggles ^= PREFTOGGLE_CHAT_GHOSTPDA
@@ -410,7 +410,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "<b>Donator Publicity:</b> <a href='byond://?_src_=prefs;preference=donor_public'><b>[(toggles & PREFTOGGLE_DONATOR_PUBLIC) ? "Public" : "Hidden"]</b></a><br>"
dat += "<b>FPS:</b> <a href='byond://?_src_=prefs;preference=clientfps;task=input'>[clientfps]</a><br>"
dat += "<b>Ghost Ears:</b> <a href='byond://?_src_=prefs;preference=ghost_ears'><b>[(toggles & PREFTOGGLE_CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</b></a><br>"
dat += "<b>Ghost Radio:</b> <a href='byond://?_src_=prefs;preference=ghost_radio'><b>[(toggles & PREFTOGGLE_CHAT_GHOSTRADIO) ? "All Chatter" : "No Chatter"]</b></a><br>"
dat += "<b>Ghost Radio:</b> <a href='byond://?_src_=prefs;preference=ghost_radio'><b>[(toggles & PREFTOGGLE_CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]</b></a><br>"
dat += "<b>Ghost Sight:</b> <a href='byond://?_src_=prefs;preference=ghost_sight'><b>[(toggles & PREFTOGGLE_CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]</b></a><br>"
dat += "<b>Ghost PDA:</b> <a href='byond://?_src_=prefs;preference=ghost_pda'><b>[(toggles & PREFTOGGLE_CHAT_GHOSTPDA) ? "All PDA Messages" : "No PDA Messages"]</b></a><br>"
if(check_rights(R_ADMIN,0))
@@ -65,20 +65,14 @@
/datum/preference_toggle/toggle_ghost_radio
name = "Toggle Ghost Radio"
description = "Toggle between hearing all radio chatter, or only from nobody"
description = "Toggle between hearing all radio chatter, or only from nearby speakers"
preftoggle_bitflag = PREFTOGGLE_CHAT_GHOSTRADIO
preftoggle_toggle = PREFTOGGLE_TOGGLE1
preftoggle_category = PREFTOGGLE_CATEGORY_GHOST
enable_message = "As a ghost, you will now hear all radio chat in the world."
disable_message = "As a ghost, you will now hear no radio chat."
enable_message = "As a ghost, you will now only hear from nearby speakers."
disable_message = "As a ghost, you will now hear all radio chat in the world."
blackbox_message = "Toggle GhostRadio"
/datum/preference_toggle/toggle_ghost_radio/set_toggles(client/user)
. = ..()
if(isobserver(user.mob))
var/mob/dead/observer/dead_dude = user.mob
dead_dude.update_dead_radio()
/datum/preference_toggle/toggle_admin_radio
name = "Admin Radio"
description = "Toggle seeing radiochatter from radios and speakers"
@@ -952,11 +952,5 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
log_debug("[key_name(src)] ended up in regular cleanup_observe rather than the mentor cleanup observe despite having TRAIT_MENTOR_OBSERVING. This is likely a bug and may result in them being stuck outside of their bodies.")
cleanup_observe()
/mob/dead/observer/proc/update_dead_radio()
if(get_preference(PREFTOGGLE_CHAT_GHOSTRADIO))
GLOB.deadchat_radio.listeners |= src
else
GLOB.deadchat_radio.listeners -= src
#undef GHOST_CAN_REENTER
#undef GHOST_IS_OBSERVER
@@ -10,5 +10,3 @@
if(GLOB.non_respawnable_keys[ckey])
can_reenter_corpse = 0
REMOVE_TRAIT(src, TRAIT_RESPAWNABLE, GHOSTED)
update_dead_radio()