cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conversion of realname and nickname from bay (#19120)

Browse Source 
* Automatic changelog compile [ci skip]

* replace all bay instances for realname and nickname with tg

* add comments where uncertain of sanitisation needed

* Fix issue from git conflict..

* Fix issue causing setup menu not opening

* Attempt to clean up how name datums are handled

* Remove redundant check

* Fix number issues with character names

---------

Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
This commit is contained in:
Aura Dusklight
2026-02-08 17:34:04 +01:00
committed by GitHub
co-authored by vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
parent 8e057cf72b
commit 311c0117c1
33 changed files with 201 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/birthday.dm
+1 -1
View File
@@ -3,7 +3,7 @@
var/bday_day = read_preference(/datum/preference/numeric/human/bday_day)
if(!bday_month || !bday_day) //If we don't have one of these set, don't worry about it
return
if(real_name != client.prefs.real_name) //let's not celebrate the birthday of that weird mob we got dropped into
if(real_name != client.prefs.read_preference(/datum/preference/name/real_name)) //let's not celebrate the birthday of that weird mob we got dropped into
return
if(!(read_preference(/datum/preference/numeric/human/last_bday_note) < GLOB.world_time_year)) //you only get notified once a year
code/game/jobs/job_controller.dm
+11 -9
View File
@@ -725,19 +725,20 @@ GLOBAL_DATUM(job_master, /datum/controller/occupations)
message_admins("[key_name(C)] has requested to vore spawn into [key_name(pred)]")
var/confirm
var/spawner_name = C.prefs.read_preference(/datum/preference/name/real_name)
if(pred.no_latejoin_vore_warning)
if(pred.no_latejoin_vore_warning_time > 0)
if(absorb_choice)
confirm = tgui_alert(pred, "[C.prefs.real_name] is attempting to spawn absorbed as your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), pred.no_latejoin_vore_warning_time SECONDS)
confirm = tgui_alert(pred, "[spawner_name] is attempting to spawn absorbed as your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), pred.no_latejoin_vore_warning_time SECONDS)
else
confirm = tgui_alert(pred, "[C.prefs.real_name] is attempting to spawn into your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), pred.no_latejoin_vore_warning_time SECONDS)
confirm = tgui_alert(pred, "[spawner_name] is attempting to spawn into your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), pred.no_latejoin_vore_warning_time SECONDS)
if(!confirm)
confirm = "Yes"
else
if(absorb_choice)
confirm = tgui_alert(pred, "[C.prefs.real_name] is attempting to spawn absorbed as your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
confirm = tgui_alert(pred, "[spawner_name] is attempting to spawn absorbed as your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
else
confirm = tgui_alert(pred, "[C.prefs.real_name] is attempting to spawn into your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
confirm = tgui_alert(pred, "[spawner_name] is attempting to spawn into your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
if(confirm != "Yes")
to_chat(C, span_warning("[pred] has declined your spawn request."))
var/message = tgui_input_text(pred,"Do you want to leave them a message?", "Notify Prey", max_length = MAX_MESSAGE_LEN)
@@ -802,19 +803,20 @@ GLOBAL_DATUM(job_master, /datum/controller/occupations)
message_admins("[key_name(C)] has requested to pred spawn onto [key_name(prey)]")
var/confirm
var/spawner_name = C.prefs.read_preference(/datum/preference/name/real_name)
if(prey.no_latejoin_prey_warning)
if(prey.no_latejoin_prey_warning_time > 0)
if(absorb_choice)
confirm = tgui_alert(prey, "[C.prefs.real_name] is attempting to televore and instantly absorb you with their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), prey.no_latejoin_prey_warning_time SECONDS)
confirm = tgui_alert(prey, "[spawner_name] is attempting to televore and instantly absorb you with their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), prey.no_latejoin_prey_warning_time SECONDS)
else
confirm = tgui_alert(prey, "[C.prefs.real_name] is attempting to televore you into their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), prey.no_latejoin_prey_warning_time SECONDS)
confirm = tgui_alert(prey, "[spawner_name] is attempting to televore you into their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"), prey.no_latejoin_prey_warning_time SECONDS)
if(!confirm)
confirm = "Yes"
else
if(absorb_choice)
confirm = tgui_alert(prey, "[C.prefs.real_name] is attempting to televore and instantly absorb you with their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
confirm = tgui_alert(prey, "[spawner_name] is attempting to televore and instantly absorb you with their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
else
confirm = tgui_alert(prey, "[C.prefs.real_name] is attempting to televore you into their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
confirm = tgui_alert(prey, "[spawner_name] is attempting to televore you into their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
if(confirm != "Yes")
to_chat(C, span_warning("[prey] has declined your spawn request."))
var/message = tgui_input_text(prey,"Do you want to leave them a message?", "Notify Pred", max_length = MAX_MESSAGE_LEN)
@@ -898,7 +900,7 @@ GLOBAL_DATUM(job_master, /datum/controller/occupations)
to_chat(C, span_boldwarning("[carrier] has received your spawn request. Please wait."))
log_and_message_admins("[key_name(C)] has requested to item spawn into [key_name(carrier)]'s possession")
var/confirm = tgui_alert(carrier, "[C.prefs.real_name] is attempting to join as the [item_name] in your possession.", "Confirm", list("No", "Yes"))
var/confirm = tgui_alert(carrier, "[C.prefs.read_preference(/datum/preference/name/real_name)] is attempting to join as the [item_name] in your possession.", "Confirm", list("No", "Yes"))
if(confirm != "Yes")
to_chat(C, span_warning("[carrier] has declined your spawn request."))
var/message = tgui_input_text(carrier,"Do you want to leave them a message?", "Notify Spawner", max_length = MAX_MESSAGE_LEN)
code/game/machinery/protean_reconstitutor.dm
+1 -1
View File
@@ -235,7 +235,7 @@
var/picked_slot = posibrain_client.prefs.default_slot
var/charjob
var/datum/data/record/record_found
record_found = find_general_record("name",posibrain_client.prefs.real_name)
record_found = find_general_record("name", posibrain_client.prefs.read_preference(/datum/preference/name/real_name))
if(record_found)
charjob = record_found.fields["real_rank"]
else
code/game/objects/items/devices/communicator/UI_tgui.dm
+3 -3
View File
@@ -155,7 +155,7 @@
for(var/mob/observer/dead/O in known_devices)
if(O.client && O.client.prefs.communicator_visibility == 1 && O.exonet)
communicators.Add(list(list(
"name" = sanitize("[O.client.prefs.real_name]'s communicator"),
"name" = sanitize("[O.client.prefs.read_preference(/datum/preference/name/real_name)]'s communicator"),
"address" = O.exonet.address,
"ref" = "\ref[O]"
)))
@@ -173,7 +173,7 @@
for(var/mob/observer/dead/O in voice_invites)
if(O.exonet && O.client)
invites.Add(list(list(
"name" = sanitize("[O.client.prefs.real_name]'s communicator"),
"name" = sanitize("[O.client.prefs.read_preference(/datum/preference/name/real_name)]'s communicator"),
"address" = O.exonet.address,
"ref" = "\ref[O]"
)))
@@ -191,7 +191,7 @@
for(var/mob/observer/dead/O in voice_requests)
if(O.exonet && O.client)
requests.Add(list(list(
"name" = sanitize("[O.client.prefs.real_name]'s communicator"),
"name" = sanitize("[O.client.prefs.read_preference(/datum/preference/name/real_name)]'s communicator"),
"address" = O.exonet.address,
"ref" = "\ref[O]"
)))
code/game/objects/items/devices/communicator/communicator.dm
+1 -1
View File
@@ -261,7 +261,7 @@
. = ..()
exonet = new(src)
if(client)
exonet.make_address("communicator-[src.client]-[src.client.prefs.real_name]")
exonet.make_address("communicator-[src.client]-[src.client.prefs.read_preference(/datum/preference/name/real_name)]")
else
exonet.make_address("communicator-[key]-[src.real_name]")
code/game/objects/items/devices/communicator/messaging.dm
+1 -1
View File
@@ -129,7 +129,7 @@
return //something is terribly wrong
for(var/mob/living/L in GLOB.mob_list) //Simple check so you don't have dead people calling.
if(src.client.prefs.real_name == L.real_name)
if(src.client.prefs.read_preference(/datum/preference/name/real_name) == L.real_name)
to_chat(src, span_danger("Your identity is already present in the game world. Please load in a different character first."))
return
code/game/objects/items/devices/communicator/phone.dm
+3 -2
View File
@@ -286,7 +286,8 @@
if (usr != src)
return //something is terribly wrong
var/confirm = tgui_alert(src, "Would you like to talk as [src.client.prefs.real_name], over a communicator? This will reset your respawn timer, if someone answers.", "Join as Voice?", list("Yes","No"))
var/prefs_name = src.client.prefs.read_preference(/datum/preference/name/real_name)
var/confirm = tgui_alert(src, "Would you like to talk as [prefs_name], over a communicator? This will reset your respawn timer, if someone answers.", "Join as Voice?", list("Yes","No"))
if(confirm != "Yes")
return
@@ -295,7 +296,7 @@
return
for(var/mob/living/L in GLOB.mob_list) //Simple check so you don't have dead people calling.
if(src.client.prefs.real_name == L.real_name)
if(prefs_name == L.real_name)
to_chat(src, span_danger("Your identity is already present in the game world. Please load in a different character first."))
return