diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 79b9e472f3f..8c71cb0c8cf 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -219,7 +219,7 @@ var/showadminmessages = 1 message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") del(M.client) - del(M) + //del(M) // See not reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. if("No") var/reason = input(usr,"Reason?","reason","Griefer") as text if(!reason) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 6c2606a3c13..00f54ec995f 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -47,6 +47,12 @@ datum/preferences real_name = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names))) proc/randomize_hair_color(var/target = "hair") + if (prob (50) && target == "facial") // Chance to inherit head color + r_facial = r_hair + g_facial = g_hair + b_facial = b_hair + return + var/red var/green var/blue @@ -608,7 +614,7 @@ datum/preferences if (link_tags["s_tone"]) switch(link_tags["s_tone"]) if ("random") - src.s_tone = -(rand (1, 220)) + src.s_tone = (-(rand (1, 220))) -35 if("input") var/new_tone = input(user, "Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation") as text if (new_tone) @@ -633,7 +639,10 @@ datum/preferences if (link_tags["f_style"]) switch(link_tags["f_style"]) if ("random") - src.f_style = pick ("Watson", "Chaplin", "Selleck", "Full Beard", "Long Beard", "Neckbeard", "Van Dyke", "Elvis", "Abe", "Chinstrap", "Hipster", "Goatee", "Hogan", "Shaved") + if (src.gender == FEMALE && !prob (1)) + src.f_style = "Shaved" + else + src.f_style = pick ("Watson", "Chaplin", "Selleck", "Full Beard", "Long Beard", "Neckbeard", "Van Dyke", "Elvis", "Abe", "Chinstrap", "Hipster", "Goatee", "Hogan") if("input") var/new_style = input(user, "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) @@ -661,7 +670,10 @@ datum/preferences if(!IsGuestKey(user.key)) switch(link_tags["underwear"]) if ("random") - src.underwear = rand (0, 1) + if (prob (65)) + src.underwear = 1 + else + src.underwear = 0 if("input") if (src.underwear == 1) src.underwear = 0 diff --git a/goonstation.dme b/goonstation.dme index 5650b4e9b74..f577916061d 100644 --- a/goonstation.dme +++ b/goonstation.dme @@ -574,6 +574,7 @@ #include "code\modules\mob\dead\observer\login.dm" #include "code\modules\mob\dead\observer\observer.dm" #include "code\modules\mob\dead\observer\say.dm" +#include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\carbon\carbon.dm" #include "code\modules\mob\living\carbon\alien\say.dm" #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"