diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 217228b361..2318c4a6d7 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -110,7 +110,7 @@
var/nuke_code = "[rand(10000, 99999)]"
var/leader_selected = 0
- var/agent_number = 1
+ //var/agent_number = 1
for(var/datum/mind/synd_mind in syndicates)
synd_mind.current.loc = get_turf(synd_spawn)
@@ -122,9 +122,9 @@
if(!leader_selected)
prepare_syndicate_leader(synd_mind, nuke_code)
leader_selected = 1
- else
- synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]"
- agent_number++
+ //else
+ //synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]"
+ //agent_number++
equip_syndicate(synd_mind.current)
update_synd_icons_added(synd_mind)
@@ -156,10 +156,10 @@
/datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code)
- var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
- spawn(1)
- NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
- synd_mind.current.real_name = "[syndicate_name()] [leader_title]"
+ // var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
+ // spawn(1) // don't change names anymore!
+ // NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
+ //synd_mind.current.real_name = "[syndicate_name()] [leader_title]"
if (nuke_code)
synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0)
synd_mind.current << "The nuclear authorization code is: [nuke_code]"
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index c3e699bc64..4f84976487 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -223,7 +223,7 @@
if("Mime")
return list(access_maint_tunnels, access_mime, access_theatre)
if("Chef")
- return list(access_kitchen, access_morgue)
+ return list(access_kitchen)
if("Roboticist")
return list(access_robotics, access_tech_storage, access_maint_tunnels)
if("Cargo Technician")
diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm
index 0f88397d04..9dc558db8e 100644
--- a/code/game/objects/closets/secure/security.dm
+++ b/code/game/objects/closets/secure/security.dm
@@ -52,6 +52,7 @@
sleep(2)
new /obj/item/clothing/under/jensen(src)
new /obj/item/clothing/suit/armor/hos/jensen(src)
+ new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/head/helmet/HoS/dermal(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/weapon/shield/riot(src)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index e3133bdc82..1e8dc322f4 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -213,7 +213,7 @@
verbs += /proc/possess
verbs += /proc/release
verbs += /client/proc/toggleprayers
-
+ verbs += /client/proc/editappear
if (holder.level >= 2)//Admin Candidate********************************************************************
verbs += /client/proc/cmd_admin_add_random_ai_law
@@ -394,6 +394,7 @@
verbs -= /client/proc/play_local_sound
verbs -= /client/proc/enable_mapping_debug
verbs -= /client/proc/toggleprayers
+ verbs -= /client/proc/editappear
verbs -= /client/proc/jump_to_dead_group
verbs -= /client/proc/Blobize
verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
@@ -758,3 +759,54 @@
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.nodamage ? "On" : "Off")]")
message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.nodamage ? "On" : "Off")]", 1)
+
+/client/proc/editappear(mob/living/carbon/human/M as mob in world)
+ set name = "Edit Appearance"
+ set category = "Admin"
+ if(!istype(M, /mob/living/carbon/human))
+ usr << "\red You can only do this to humans!"
+ return
+
+ var/new_facial = input("Please select facial hair color.", "Character Generation") as color
+ if(new_facial)
+ M.r_facial = hex2num(copytext(new_facial, 2, 4))
+ M.g_facial = hex2num(copytext(new_facial, 4, 6))
+ M.b_facial = hex2num(copytext(new_facial, 6, 8))
+
+ var/new_hair = input("Please select hair color.", "Character Generation") as color
+ if(new_facial)
+ M.r_hair = hex2num(copytext(new_hair, 2, 4))
+ M.g_hair = hex2num(copytext(new_hair, 4, 6))
+ M.b_hair = hex2num(copytext(new_hair, 6, 8))
+
+ var/new_eyes = input("Please select eye color.", "Character Generation") as color
+ if(new_eyes)
+ M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
+ M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
+ M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
+
+ var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation") as text
+
+ if (new_tone)
+ M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
+ M.s_tone = -M.s_tone + 35
+
+ var/new_style = input("Please select hair style", "Character Generation") as null|anything in list( "Cut Hair", "Short Hair", "Long Hair", "Mohawk", "Balding", "Wave", "Bedhead", "Dreadlocks", "Ponytail", "Bald" )
+
+ if (new_style)
+ M.h_style = new_style
+
+ new_style = input("Please select facial style", "Character Generation") as null|anything in list("Watson", "Chaplin", "Selleck", "Full Beard", "Long Beard", "Neckbeard", "Van Dyke", "Elvis", "Abe", "Chinstrap", "Hipster", "Goatee", "Hogan", "Shaved")
+
+ if (new_style)
+ M.f_style = new_style
+
+ var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
+ if (new_gender)
+ if(new_gender == "Male")
+ M.gender = MALE
+ else
+ M.gender = FEMALE
+ M.update_body()
+ M.update_face()
+ M.update_clothing()