Fixed cyborgs not getting their names at round start (#38675)

* fixed cyborgs not getting their names at round start
fixed cyborgs and A.Is being able to get around appearance bans

* Update job.dm

* Update silicon.dm

* goodbye unneeded config otpion

* Update game_options.txt
This commit is contained in:
CitrusGender
2018-06-24 21:55:13 +03:00
committed by vuonojenmustaturska
parent 5ed68f7b0a
commit 501fd35cba
7 changed files with 6 additions and 12 deletions
+1 -1
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)
@@ -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
+1 -1
View File
@@ -442,7 +442,7 @@ 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)
job.after_spawn(H, M, joined_late)
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.
return H
+1 -2
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)
@@ -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()
+1 -2
View File
@@ -379,8 +379,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
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