cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cyborgs not getting their names at round start

Browse Source
This commit is contained in:
CitrusGender
2018-06-24 14:55:13 -04:00
committed by letterjay
parent 386bc528ea
commit d50ae43d7f
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/unsorted.dm
View File

@@ -195,7 +195,7 @@ Turf and target are separate in case you want to teleport some distance from a t
var/safety = 0
while(loop && safety < 5)
if(C && C.prefs.custom_names[role] && !safety)
if(C && C.prefs.custom_names[role] && !safety && (!jobban_isbanned(src, "appearance")))
newname = C.prefs.custom_names[role]
else
switch(role)

2
code/controllers/configuration/entries/game_options.dm
View File

@@ -170,8 +170,6 @@
config_entry_value = -1
min_val = -1
/datum/config_entry/flag/rename_cyborg
/datum/config_entry/flag/ooc_during_round
/datum/config_entry/flag/emojis

4
code/controllers/subsystem/job.dm
View File

@@ -434,12 +434,16 @@ SUBSYSTEM_DEF(job)
to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
if(job && H)
<<<<<<< HEAD
if(job.dresscodecompliant)// CIT CHANGE - dress code compliance
equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
job.after_spawn(H, M, joined_late)
equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
//handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role) //CIT CHANGE - makes donators spawn with their items. This can safely be commented out when all of the donator items are migrated to the loadout system
=======
job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
>>>>>>> 501fd35... Fixed cyborgs not getting their names at round start (#38675)
return H

3
code/modules/jobs/job_types/silicon.dm
View File

@@ -85,5 +85,4 @@ Cyborg
return H.Robotize(FALSE, latejoin)
/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
if(CONFIG_GET(flag/rename_cyborg)) //name can't be set in robot/New without the client
R.rename_self("cyborg", M.client)
R.rename_self("cyborg", M.client)

3
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -232,7 +232,8 @@
if(custom_name)
changed_name = custom_name
if(changed_name == "" && client)
changed_name = client.prefs.custom_names["cyborg"]
rename_self(src, client)
return //built in camera handled in proc
if(!changed_name)
changed_name = get_standard_name()

3
code/modules/mob/transform_procs.dm
View File

@@ -381,8 +381,7 @@
else if(transfer_after)
R.key = key
if (CONFIG_GET(flag/rename_cyborg))
R.rename_self("cyborg")
R.rename_self("cyborg")
if(R.mmi)
R.mmi.name = "Man-Machine Interface: [real_name]"

3
config/game_options.txt
View File

@@ -16,9 +16,6 @@ REVIVAL_BRAIN_LIFE -1
## RENAMING ###
## Uncomment to allow cyborgs to rename themselves at roundstart. Has no effect on roboticists renaming cyborgs the normal way.
#RENAME_CYBORG
## OOC DURING ROUND ###
## Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
OOC_DURING_ROUND