cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed mob/var/UI, it now uses client.prefs.UI_style

Browse Source 
Removed var/constant/Pi It's already defined in setup.dm
Moved a bunch of global_lists to global_lists.dm
Fixed hair randomisation. (still bits to do)
Moved a lot of preferences_setup.dm stuff into __HELPERS/mobs.dm They'll be FAR more helpful as generic procs, rather than something tied to preferences.
Merged mob/var/nopush into status_flags with the CANPUSH flag
Merged mob/var/nodamage into status_flags with the GODMODE flag
Removed mob/var/be_syndicate and mob/var/be_random_name as they are not used.
Added /proc/ui_style2icon(ui_style) proc. It converts a string like "Midnight" into its corresponding dmi file. The code fore creating a new hud uses it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5164 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-11-22 15:22:08 +00:00
parent bae59832d6
commit 73b54b017b
52 changed files with 344 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+4 -4
View File
@@ -114,9 +114,9 @@
src << "\blue Now teleporting."
observer.loc = O.loc
if(client.prefs.be_random_name)
client.prefs.randomize_name()
observer.name = client.prefs.real_name
observer.real_name = observer.name
client.prefs.real_name = random_name()
observer.real_name = client.prefs.real_name
observer.name = observer.real_name
observer.key = key
del(src)
@@ -296,7 +296,7 @@
if(ticker.random_players)
new_character.gender = pick(MALE, FEMALE)
client.prefs.randomize_name()
client.prefs.real_name = random_name()
client.prefs.randomize_appearance_for(new_character)
else
client.prefs.copy_to(new_character)
code/modules/mob/new_player/preferences_setup.dm
+17 -201
View File
@@ -5,171 +5,30 @@ datum/preferences
gender = MALE
else
gender = FEMALE
randomize_skin_tone()
randomize_hair(gender)
randomize_hair_color("hair")
if(gender == MALE)//only for dudes.
randomize_facial()
randomize_hair_color("facial")
randomize_eyes_color()
underwear = 1
s_tone = random_skin_tone()
h_style = random_hair_style(gender)
f_style = random_facial_hair_style(gender)
r_hair = rand(0,255)
g_hair = rand(0,255)
b_hair = rand(0,255)
r_facial = r_hair
g_facial = g_hair
b_facial = b_hair
r_eyes = rand(0,255)
g_eyes = rand(0,255)
b_eyes = rand(0,255)
underwear = rand(1,underwear_m.len)
backbag = 2
age = rand(19,35)
age = rand(AGE_MIN,AGE_MAX)
copy_to(H,1)
proc/randomize_name()
if(gender == MALE)
real_name = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
else
real_name = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names)))
return
proc/randomize_hair(var/gender)
h_style = pick(hair_styles_list)
proc/randomize_facial() // uncommented, see randomize_hair() for commentation
f_style = pick(facial_hair_styles_list)
proc/randomize_skin_tone()
var/tone
var/tmp = pickweight ( list ("caucasian" = 55, "afroamerican" = 15, "african" = 10, "latino" = 10, "albino" = 5, "weird" = 5))
switch (tmp)
if ("caucasian")
tone = -45 + 35
if ("afroamerican")
tone = -150 + 35
if ("african")
tone = -200 + 35
if ("latino")
tone = -90 + 35
if ("albino")
tone = -1 + 35
if ("weird")
tone = -(rand (1, 220)) + 35
s_tone = min(max(tone + rand (-25, 25), -185), 34)
proc/randomize_hair_color(var/target = "hair")
if (prob (75) && target == "facial") // Chance to inherit hair color
r_facial = r_hair
g_facial = g_hair
b_facial = b_hair
return
var/red
var/green
var/blue
var/col = pick ("blonde", "black", "chestnut", "copper", "brown", "wheat", "old", "punk")
switch (col)
if ("blonde")
red = 255
green = 255
blue = 0
if ("black")
red = 0
green = 0
blue = 0
if ("chestnut")
red = 153
green = 102
blue = 51
if ("copper")
red = 255
green = 153
blue = 0
if ("brown")
red = 102
green = 51
blue = 0
if ("wheat")
red = 255
green = 255
blue = 153
if ("old")
red = rand (100, 255)
green = red
blue = red
if ("punk")
red = rand (0, 255)
green = rand (0, 255)
blue = rand (0, 255)
red = max(min(red + rand (-25, 25), 255), 0)
green = max(min(green + rand (-25, 25), 255), 0)
blue = max(min(blue + rand (-25, 25), 255), 0)
switch(target)
if ("hair")
r_hair = red
g_hair = green
b_hair = blue
if ("facial")
r_facial = red
g_facial = green
b_facial = blue
proc/randomize_eyes_color()
var/red
var/green
var/blue
var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino", "weird")
switch (col)
if ("black")
red = 0
green = 0
blue = 0
if ("grey")
red = rand (100, 200)
green = red
blue = red
if ("brown")
red = 102
green = 51
blue = 0
if ("chestnut")
red = 153
green = 102
blue = 0
if ("blue")
red = 51
green = 102
blue = 204
if ("lightblue")
red = 102
green = 204
blue = 255
if ("green")
red = 0
green = 102
blue = 0
if ("albino")
red = rand (200, 255)
green = rand (0, 150)
blue = rand (0, 150)
if ("weird")
red = rand (0, 255)
green = rand (0, 255)
blue = rand (0, 255)
red = max(min(red + rand (-25, 25), 255), 0)
green = max(min(green + rand (-25, 25), 255), 0)
blue = max(min(blue + rand (-25, 25), 255), 0)
r_eyes = red
g_eyes = green
b_eyes = blue
proc/update_preview_icon()
proc/update_preview_icon() //seriously. This is horrendous.
del(preview_icon_front)
del(preview_icon_side)
var/icon/preview_icon = null
var/g = "m"
if (gender == FEMALE) g = "f"
if(gender == FEMALE) g = "f"
preview_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
@@ -492,47 +351,4 @@ datum/preferences
del(preview_icon)
del(eyes_s)
del(clothes_s)
proc/skintone2racedescription(var/tone)
switch (tone)
if(30 to INFINITY)
return "albino"
if(20 to 30)
return "pale"
if(5 to 15)
return "light skinned"
if(-10 to 5)
return "white"
if(-25 to -10)
return "tan"
if(-45 to -25)
return "darker skinned"
if(-65 to -45)
return "brown"
if(-INFINITY to -65)
return "black"
proc/age2agedescription(var/age)
switch (age)
if(0 to 1)
return "infant"
if(1 to 3)
return "toddler"
if(3 to 13)
return "child"
if(13 to 19)
return "teenager"
if(19 to 30)
return "young adult"
if(30 to 45)
return "adult"
if(45 to 60)
return "middle-aged"
if(60 to 70)
return "aging"
if(70 to INFINITY)
return "elderly"
del(clothes_s)
code/modules/mob/new_player/sprite_accessories.dm
+28 -35
View File
@@ -26,8 +26,7 @@
var/name // the preview name of the accessory
// Determines if the accessory will be skipped or included in random hair generations
var/choose_female = 1
var/choose_male = 1
var/gender = NEUTER
/*
@@ -97,12 +96,12 @@
pompadour
name = "Pompadour"
icon_state = "hair_pompadour"
choose_female = 0
gender = MALE
quiff
name = "Quiff"
icon_state = "hair_quiff"
choose_female = 0
gender = MALE
bedhead
name = "Bedhead"
@@ -119,37 +118,37 @@
beehive
name = "Beehive"
icon_state = "hair_beehive"
choose_male = 0
gender = FEMALE
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
choose_male = 0
gender = FEMALE
bob
name = "Bob"
icon_state = "hair_bobcut"
choose_male = 0
gender = FEMALE
bowl
name = "Bowl"
icon_state = "hair_bowlcut"
choose_female = 0
gender = MALE
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
choose_female = 0
gender = MALE
crew
name = "Crewcut"
icon_state = "hair_crewcut"
choose_female = 0
gender = MALE
combover
name = "Combover"
icon_state = "hair_combover"
choose_female = 0
gender = MALE
devillock
name = "Devil Lock"
@@ -158,7 +157,7 @@
dreadlocks
name = "Dreadlocks"
icon_state = "hair_dreads"
choose_female = 0 // okay.jpg
gender = MALE // okay.jpg
curls
name = "Curls"
@@ -175,12 +174,12 @@
afro_large
name = "Big Afro"
icon_state = "hair_bigafro"
choose_female = 0
gender = MALE
sargeant
name = "Flat Top"
icon_state = "hair_sargeant"
choose_female = 0
gender = MALE
emo
name = "Emo"
@@ -197,27 +196,27 @@
hitop
name = "Hitop"
icon_state = "hair_hitop"
choose_female = 0
gender = MALE
mohawk
name = "Mohawk"
icon_state = "hair_d"
choose_female = 0 // gross
gender = MALE // gross
jensen
name = "Adam Jensen Hair"
icon_state = "hair_jensen"
choose_female = 0
gender = MALE
gelled
name = "Gelled Back"
icon_state = "hair_gelled"
choose_male = 0
gender = FEMALE
spiky
name = "Spiky"
icon_state = "hair_spikey"
choose_female = 0
gender = MALE
kusangi
name = "Kusanagi Hair"
@@ -226,32 +225,32 @@
kagami
name = "Pigtails"
icon_state = "hair_kagami"
choose_male = 0
gender = FEMALE
himecut
name = "Hime Cut"
icon_state = "hair_himecut"
choose_male = 0
gender = FEMALE
braid
name = "Floorlength Braid"
icon_state = "hair_braid"
choose_male = 0
gender = FEMALE
odango
name = "Odango"
icon_state = "hair_odango"
choose_male = 0
gender = FEMALE
ombre
name = "Ombre"
icon_state = "hair_ombre"
choose_male = 0
gender = FEMALE
updo
name = "Updo"
icon_state = "hair_updo"
choose_male = 0
gender = FEMALE
skinhead
name = "Skinhead"
@@ -260,12 +259,12 @@
balding
name = "Balding Hair"
icon_state = "hair_e"
choose_female = 0 // turnoff!
gender = MALE // turnoff!
bald
name = "Bald"
icon_state = "bald"
choose_female = 0
gender = MALE
/*
///////////////////////////////////
@@ -278,12 +277,12 @@
/datum/sprite_accessory/facial_hair
icon = 'icons/mob/human_face.dmi'
choose_female = 0 // barf (unless you're a dorf, dorfs dig chix /w beards :P)
gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
shaved
name = "Shaved"
icon_state = "bald"
choose_female = 1 // shaved is the only facial hair on women because why would chicks have beards???
gender = NEUTER
watson
name = "Watson Mustache"
@@ -348,9 +347,3 @@
dwarf
name = "Dwarf Beard"
icon_state = "facial_dwarf"