cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-07 21:39:34 +10:00
parent 990090326d
commit e263f273f1
16 changed files with 7470 additions and 7766 deletions
+10 -9
View File
@@ -24,21 +24,19 @@
proc/new_player_panel_proc()
var/output = "<B>New Player Options</B>"
var/output = "<div align='center'><B>New Player Options</B>"
output +="<hr>"
output += "<br><a href='byond://?src=\ref[src];show_preferences=1'>Setup Character</A><br><br>"
output += "<p><a href='byond://?src=\ref[src];show_preferences=1'>Setup Character</A></p>"
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
if(!ready)
output += "<a href='byond://?src=\ref[src];ready=1'>Declare Ready</A><br><br>"
else
output += "<b>You are ready</b> (<a href='byond://?src=\ref[src];ready=2'>Cancel</A>)<br><br>"
if(!ready) output += "<p><a href='byond://?src=\ref[src];ready=1'>Declare Ready</A></p>"
else output += "<p><b>You are ready</b> (<a href='byond://?src=\ref[src];ready=2'>Cancel</A>)</p>"
else
output += "<a href='byond://?src=\ref[src];manifest=1'>View the Crew Manifest</A><br><br>"
output += "<a href='byond://?src=\ref[src];late_join=1'>Join Game!</A><br><br>"
output += "<p><a href='byond://?src=\ref[src];late_join=1'>Join Game!</A></p>"
output += "<a href='byond://?src=\ref[src];observe=1'>Observe</A><br><br>"
output += "<p><a href='byond://?src=\ref[src];observe=1'>Observe</A></p>"
if(!IsGuestKey(src.key))
establish_db_connection()
@@ -58,7 +56,10 @@
output += "<p><b><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A> (NEW!)</b></p>"
else
output += "<p><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A></p>"
src << browse(output,"window=playersetup;size=250x258;can_close=0")
output += "</div>"
src << browse(output,"window=playersetup;size=210x240;can_close=0")
return
Stat()
@@ -22,7 +22,8 @@ datum/preferences
age = rand(AGE_MIN,AGE_MAX)
copy_to(H,1)
proc/update_preview_icon() //seriously. This is horrendous. del(preview_icon_front)
proc/update_preview_icon() //seriously. This is horrendous.
del(preview_icon_front)
del(preview_icon_side)
var/icon/preview_icon = null
@@ -60,7 +61,6 @@ datum/preferences
preview_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
// Skin tone
if(species == "Human")
if (s_tone >= 0)
@@ -119,6 +119,7 @@
name = "Pompadour"
icon_state = "hair_pompadour"
gender = MALE
species_allowed = list("Human","Soghun")
quiff
name = "Quiff"
@@ -141,16 +142,19 @@
name = "Beehive"
icon_state = "hair_beehive"
gender = FEMALE
species_allowed = list("Human","Soghun")
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
gender = FEMALE
species_allowed = list("Human","Soghun")
bob
name = "Bob"
icon_state = "hair_bobcut"
gender = FEMALE
species_allowed = list("Human","Soghun")
bowl
name = "Bowl"
@@ -161,6 +165,7 @@
name = "Buzzcut"
icon_state = "hair_buzzcut"
gender = MALE
species_allowed = list("Human","Soghun")
crew
name = "Crewcut"
@@ -179,7 +184,6 @@
dreadlocks
name = "Dreadlocks"
icon_state = "hair_dreads"
gender = MALE // okay.jpg
curls
name = "Curls"
@@ -343,6 +347,7 @@
elvis
name = "Elvis Sideburns"
icon_state = "facial_elvis"
species_allowed = list("Human","Soghun")
abe
name = "Abraham Lincoln Beard"
@@ -418,28 +423,37 @@
icon_state = "tajears"
species_allowed = list("Tajaran")
//skin styles - WIP
//skin styles - WIP
//going to have to re-integrate this with surgery
//let the icon_state hold an icon preview for now
/datum/sprite_accessory/skin
icon = 'icons/mob/human_races/r_human.dmi'
human
name = "Default human skin"
icon = "human"
icon_state = "default"
species_allowed = list("Human")
human_tatt01
name = "Tatt01 human skin"
icon = "human_tattoo1"
icon_state = "tatt1"
species_allowed = list("Human")
tajaran
name = "Default tajaran skin"
icon = "tajaran"
icon_state = "default"
icon = 'icons/mob/human_races/r_tajaran.dmi'
species_allowed = list("Tajaran")
soghun
name = "Default soghun skin"
icon = "soghun"
icon_state = "default"
icon = 'icons/mob/human_races/r_lizard.dmi'
species_allowed = list("Soghun")
skrell
name = "Default skrell skin"
icon = "skrell"
species_allowed = list("Skrell")
icon_state = "default"
icon = 'icons/mob/human_races/r_skrell.dmi'
species_allowed = list("Skrell")