Fixed disclusion of important file error.

Fixed "bearded woman" bug.
Added some chance that facial hair color will inherit head color.
Removed deletion of mob on client ban. Some important stuff could be missed and ban could be lifted before the end of the round. So it's up to admin to decide what to do with the body.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@545 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Rygzengrho
2010-12-05 21:18:04 +00:00
parent 3a11f5828c
commit e626f3a3a7
3 changed files with 17 additions and 4 deletions
+1 -1
View File
@@ -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)
+15 -3
View File
@@ -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