From 56d196aabff45a8f6bb51f47532329ba9877131a Mon Sep 17 00:00:00 2001 From: Skiedrake Date: Tue, 21 Sep 2010 17:40:17 +0000 Subject: [PATCH] You can now choose whether to use the old or the new UI in the preferences. Changelog updated accordingly. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@132 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/mob/mob.dm | 5 +- code/game/hud.dm | 4 +- code/modules/mob/living/carbon/human/hud.dm | 50 +++++++++++++++-- .../mob/living/carbon/human/savefile.dm | 2 + code/modules/mob/living/carbon/monkey/hud.dm | 51 ++++++++++++++++-- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/mob/new_player/preferences.dm | 18 ++++++- icons/changelog.html | 5 +- icons/mob/screen1_old.dmi | Bin 0 -> 118435 bytes 9 files changed, 122 insertions(+), 15 deletions(-) create mode 100644 icons/mob/screen1_old.dmi diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index 99b66f92a18..0d423b941aa 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -132,7 +132,6 @@ var/const/muteness = 4 var/brainloss = 0 - var/datum/dna/dna = null var/radiation = 0.0 @@ -171,4 +170,6 @@ var/update_icon = 1 // Set to 0 if you want that the mob's icon doesn't update when it moves -- Skie - // This can be used if you want to change the icon on the fly and want it to stay \ No newline at end of file + // This can be used if you want to change the icon on the fly and want it to stay + + var/UI = 'screen1_old.dmi' // For changing the UI from preferences \ No newline at end of file diff --git a/code/game/hud.dm b/code/game/hud.dm index b46238ca75a..23ca85cb603 100644 --- a/code/game/hud.dm +++ b/code/game/hud.dm @@ -74,12 +74,12 @@ obj/hud/New(var/type = 0) ASSERT(istype(mymob, /mob)) if(istype(mymob, /mob/living/carbon/human)) - src.human_hud() + src.human_hud(mymob.UI) // Pass the player the UI style chosen in preferences return if(istype(mymob, /mob/living/carbon/monkey)) - src.monkey_hud() + src.monkey_hud(mymob.UI) return //aliens diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index de7dda595ab..86bde7951f5 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -1,4 +1,4 @@ -/obj/hud/proc/human_hud() +/obj/hud/proc/human_hud(var/ui_style='screen1_old.dmi') src.adding = list( ) src.other = list( ) @@ -9,10 +9,10 @@ src.vimpaired = list( ) src.darkMask = list( ) - src.g_dither = new src.h_type( src ) src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH" src.g_dither.name = "Mask" + src.g_dither.icon = ui_style src.g_dither.icon_state = "dither12g" src.g_dither.layer = 18 src.g_dither.mouse_opacity = 0 @@ -20,6 +20,7 @@ src.alien_view = new src.h_type(src) src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH" src.alien_view.name = "Alien" + src.alien_view.icon = ui_style src.alien_view.icon_state = "alien" src.alien_view.layer = 18 src.alien_view.mouse_opacity = 0 @@ -27,6 +28,7 @@ src.blurry = new src.h_type( src ) src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH" src.blurry.name = "Blurry" + src.blurry.icon = ui_style src.blurry.icon_state = "blurry" src.blurry.layer = 17 src.blurry.mouse_opacity = 0 @@ -34,6 +36,7 @@ src.druggy = new src.h_type( src ) src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH" src.druggy.name = "Druggy" + src.druggy.icon = ui_style src.druggy.icon_state = "druggy" src.druggy.layer = 17 src.druggy.mouse_opacity = 0 @@ -51,6 +54,7 @@ using = new src.h_type( src ) using.name = "act_intent" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 @@ -60,6 +64,7 @@ using = new src.h_type( src ) using.name = "mov_intent" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") using.screen_loc = ui_movi using.layer = 20 @@ -68,24 +73,28 @@ using = new src.h_type(src) //Right hud bar using.dir = SOUTH + using.icon = ui_style using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH" using.layer = 19 src.adding += using using = new src.h_type(src) //Lower hud bar using.dir = EAST + using.icon = ui_style using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1" using.layer = 19 src.adding += using using = new src.h_type(src) //Corner Button using.dir = NORTHWEST + using.icon = ui_style using.screen_loc = "EAST+1,SOUTH-1" using.layer = 19 src.adding += using using = new src.h_type( src ) using.name = "arrowleft" + using.icon = ui_style using.icon_state = "s_arrow" using.dir = WEST using.screen_loc = ui_iarrowleft @@ -94,6 +103,7 @@ using = new src.h_type( src ) using.name = "arrowright" + using.icon = ui_style using.icon_state = "s_arrow" using.dir = EAST using.screen_loc = ui_iarrowright @@ -102,6 +112,7 @@ using = new src.h_type( src ) using.name = "drop" + using.icon = ui_style using.icon_state = "act_drop" using.screen_loc = ui_dropbutton using.layer = 19 @@ -110,6 +121,7 @@ using = new src.h_type( src ) using.name = "i_clothing" using.dir = SOUTH + using.icon = ui_style using.icon_state = "center" using.screen_loc = ui_iclothing using.layer = 19 @@ -118,6 +130,7 @@ using = new src.h_type( src ) using.name = "o_clothing" using.dir = SOUTH + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_oclothing using.layer = 19 @@ -135,6 +148,7 @@ using = new src.h_type( src ) using.name = "r_hand" using.dir = WEST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_rhand using.layer = 19 @@ -143,6 +157,7 @@ using = new src.h_type( src ) using.name = "l_hand" using.dir = EAST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_lhand using.layer = 19 @@ -151,6 +166,7 @@ using = new src.h_type( src ) using.name = "id" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_id using.layer = 19 @@ -159,6 +175,7 @@ using = new src.h_type( src ) using.name = "mask" using.dir = NORTH + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_mask using.layer = 19 @@ -167,6 +184,7 @@ using = new src.h_type( src ) using.name = "back" using.dir = NORTHEAST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_back using.layer = 19 @@ -174,6 +192,7 @@ using = new src.h_type( src ) using.name = "storage1" + using.icon = ui_style using.icon_state = "pocket" using.screen_loc = ui_storage1 using.layer = 19 @@ -181,6 +200,7 @@ using = new src.h_type( src ) using.name = "storage2" + using.icon = ui_style using.icon_state = "pocket" using.screen_loc = ui_storage2 using.layer = 19 @@ -188,6 +208,7 @@ using = new src.h_type( src ) using.name = "resist" + using.icon = ui_style using.icon_state = "act_resist" using.screen_loc = ui_resist using.layer = 19 @@ -195,6 +216,7 @@ using = new src.h_type( src ) using.name = "other" + using.icon = ui_style using.icon_state = "other" using.screen_loc = ui_shoes using.layer = 20 @@ -218,6 +240,7 @@ using = new src.h_type( src ) using.name = "gloves" + using.icon = ui_style using.icon_state = "gloves" using.screen_loc = ui_gloves using.layer = 19 @@ -225,6 +248,7 @@ using = new src.h_type( src ) using.name = "eyes" + using.icon = ui_style using.icon_state = "glasses" using.screen_loc = ui_glasses using.layer = 19 @@ -232,6 +256,7 @@ using = new src.h_type( src ) using.name = "ears" + using.icon = ui_style using.icon_state = "ears" using.screen_loc = ui_ears using.layer = 19 @@ -239,6 +264,7 @@ using = new src.h_type( src ) using.name = "head" + using.icon = ui_style using.icon_state = "hair" using.screen_loc = ui_head using.layer = 19 @@ -246,6 +272,7 @@ using = new src.h_type( src ) using.name = "shoes" + using.icon = ui_style using.icon_state = "shoes" using.screen_loc = ui_shoes using.layer = 19 @@ -253,6 +280,7 @@ using = new src.h_type( src ) using.name = "belt" + using.icon = ui_style using.icon_state = "belt" using.screen_loc = ui_belt using.layer = 19 @@ -313,6 +341,7 @@ using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "1,1 to 5,15" using.layer = 17 @@ -320,6 +349,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "5,1 to 10,5" using.layer = 17 @@ -327,6 +357,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "6,11 to 10,15" using.layer = 17 @@ -334,6 +365,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "11,1 to 15,15" using.layer = 17 @@ -341,11 +373,13 @@ src.vimpaired += using mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon.icon = ui_style mymob.throw_icon.icon_state = "act_throw_off" mymob.throw_icon.name = "throw" mymob.throw_icon.screen_loc = ui_throw mymob.oxygen = new /obj/screen( null ) + mymob.oxygen.icon = ui_style mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen @@ -363,60 +397,70 @@ */ mymob.toxin = new /obj/screen( null ) - mymob.toxin.icon = 'screen1.dmi' + mymob.toxin.icon = ui_style mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_toxin mymob.internals = new /obj/screen( null ) + mymob.internals.icon = ui_style mymob.internals.icon_state = "internal0" mymob.internals.name = "internal" mymob.internals.screen_loc = ui_internal mymob.fire = new /obj/screen( null ) + mymob.fire.icon = ui_style mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire mymob.bodytemp = new /obj/screen( null ) + mymob.bodytemp.icon = ui_style mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp mymob.healths = new /obj/screen( null ) + mymob.healths.icon = ui_style mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_health mymob.pullin = new /obj/screen( null ) + mymob.pullin.icon = ui_style mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull mymob.blind = new /obj/screen( null ) + mymob.blind.icon = ui_style mymob.blind.icon_state = "black" mymob.blind.name = " " mymob.blind.screen_loc = "1,1 to 15,15" mymob.blind.layer = 0 mymob.flash = new /obj/screen( null ) + mymob.flash.icon = ui_style mymob.flash.icon_state = "blank" mymob.flash.name = "flash" mymob.flash.screen_loc = "1,1 to 15,15" mymob.flash.layer = 17 mymob.hands = new /obj/screen( null ) + mymob.hands.icon = ui_style mymob.hands.icon_state = "hand" mymob.hands.name = "hand" mymob.hands.screen_loc = ui_hand mymob.hands.dir = NORTH mymob.sleep = new /obj/screen( null ) + mymob.sleep.icon = ui_style mymob.sleep.icon_state = "sleep0" mymob.sleep.name = "sleep" mymob.sleep.screen_loc = ui_sleep mymob.rest = new /obj/screen( null ) + mymob.rest.icon = ui_style mymob.rest.icon_state = "rest0" mymob.rest.name = "rest" mymob.rest.screen_loc = ui_rest diff --git a/code/modules/mob/living/carbon/human/savefile.dm b/code/modules/mob/living/carbon/human/savefile.dm index f3c0a072ccc..d7281a006fd 100644 --- a/code/modules/mob/living/carbon/human/savefile.dm +++ b/code/modules/mob/living/carbon/human/savefile.dm @@ -34,6 +34,7 @@ datum/preferences/proc/savefile_save(mob/user) F["be_syndicate"] << src.be_syndicate F["underwear"] << src.underwear F["name_is_always_random"] << src.be_random_name + F["UI"] << src.UI // Skie return 1 @@ -86,6 +87,7 @@ datum/preferences/proc/savefile_load(mob/user, var/silent = 1) F["be_syndicate"] >> src.be_syndicate F["underwear"] >> src.underwear F["name_is_always_random"] >> src.be_random_name + F["UI"] >> src.UI // Skie return 1 #undef SAVEFILE_VERSION_MAX diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm index d6e712acbd2..7f185f34d40 100644 --- a/code/modules/mob/living/carbon/monkey/hud.dm +++ b/code/modules/mob/living/carbon/monkey/hud.dm @@ -1,4 +1,4 @@ -/obj/hud/proc/monkey_hud() +/obj/hud/proc/monkey_hud(var/ui_style='screen1_old.dmi') src.adding = list( ) src.other = list( ) @@ -9,11 +9,12 @@ src.vimpaired = list( ) src.darkMask = list( ) - var/icon/blocked = icon('screen1.dmi',"blocked") + var/icon/blocked = icon(ui_style,"blocked") src.g_dither = new src.h_type( src ) src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH" src.g_dither.name = "Mask" + src.g_dither.icon = ui_style src.g_dither.icon_state = "dither12g" src.g_dither.layer = 18 src.g_dither.mouse_opacity = 0 @@ -21,6 +22,7 @@ src.alien_view = new src.h_type(src) src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH" src.alien_view.name = "Alien" + src.alien_view.icon = ui_style src.alien_view.icon_state = "alien" src.alien_view.layer = 18 src.alien_view.mouse_opacity = 0 @@ -28,6 +30,7 @@ src.blurry = new src.h_type( src ) src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH" src.blurry.name = "Blurry" + src.blurry.icon = ui_style src.blurry.icon_state = "blurry" src.blurry.layer = 17 src.blurry.mouse_opacity = 0 @@ -35,6 +38,7 @@ src.druggy = new src.h_type( src ) src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH" src.druggy.name = "Druggy" + src.druggy.icon = ui_style src.druggy.icon_state = "druggy" src.druggy.layer = 17 src.druggy.mouse_opacity = 0 @@ -52,6 +56,7 @@ using = new src.h_type( src ) using.name = "act_intent" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 @@ -61,6 +66,7 @@ using = new src.h_type( src ) using.name = "mov_intent" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") using.screen_loc = ui_movi using.layer = 20 @@ -69,24 +75,28 @@ using = new src.h_type(src) //Right hud bar using.dir = SOUTH + using.icon = ui_style using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH" using.layer = 19 src.adding += using using = new src.h_type(src) //Lower hud bar using.dir = EAST + using.icon = ui_style using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1" using.layer = 19 src.adding += using using = new src.h_type(src) //Corner Button using.dir = NORTHWEST + using.icon = ui_style using.screen_loc = "EAST+1,SOUTH-1" using.layer = 19 src.adding += using using = new src.h_type( src ) using.name = "arrowleft" + using.icon = ui_style using.icon_state = "s_arrow" using.dir = WEST using.screen_loc = ui_iarrowleft @@ -95,6 +105,7 @@ using = new src.h_type( src ) using.name = "arrowright" + using.icon = ui_style using.icon_state = "s_arrow" using.dir = EAST using.screen_loc = ui_iarrowright @@ -103,6 +114,7 @@ using = new src.h_type( src ) using.name = "drop" + using.icon = ui_style using.icon_state = "act_drop" using.screen_loc = ui_dropbutton using.layer = 19 @@ -111,6 +123,7 @@ using = new src.h_type( src ) using.name = "i_clothing" using.dir = SOUTH + using.icon = ui_style using.icon_state = "center" using.screen_loc = ui_iclothing using.layer = 19 @@ -120,6 +133,7 @@ using = new src.h_type( src ) using.name = "o_clothing" using.dir = SOUTH + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_oclothing using.layer = 19 @@ -138,6 +152,7 @@ using = new src.h_type( src ) using.name = "r_hand" using.dir = WEST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_rhand using.layer = 19 @@ -146,6 +161,7 @@ using = new src.h_type( src ) using.name = "l_hand" using.dir = EAST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_lhand using.layer = 19 @@ -154,6 +170,7 @@ using = new src.h_type( src ) using.name = "id" using.dir = SOUTHWEST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_id using.layer = 19 @@ -163,6 +180,7 @@ using = new src.h_type( src ) using.name = "mask" using.dir = NORTH + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_mask using.layer = 19 @@ -171,6 +189,7 @@ using = new src.h_type( src ) using.name = "back" using.dir = NORTHEAST + using.icon = ui_style using.icon_state = "equip" using.screen_loc = ui_back using.layer = 19 @@ -178,6 +197,7 @@ using = new src.h_type( src ) using.name = "storage1" + using.icon = ui_style using.icon_state = "pocket" using.screen_loc = ui_storage1 using.layer = 19 @@ -186,6 +206,7 @@ using = new src.h_type( src ) using.name = "storage2" + using.icon = ui_style using.icon_state = "pocket" using.screen_loc = ui_storage2 using.layer = 19 @@ -194,6 +215,7 @@ using = new src.h_type( src ) using.name = "resist" + using.icon = ui_style using.icon_state = "act_resist" using.screen_loc = ui_resist using.layer = 19 @@ -201,6 +223,7 @@ using = new src.h_type( src ) using.name = "other" + using.icon = ui_style using.icon_state = "other" using.screen_loc = ui_shoes using.layer = 20 @@ -208,6 +231,7 @@ using = new src.h_type( src ) using.name = "gloves" + using.icon = ui_style using.icon_state = "gloves" using.screen_loc = ui_gloves using.layer = 19 @@ -216,6 +240,7 @@ using = new src.h_type( src ) using.name = "eyes" + using.icon = ui_style using.icon_state = "glasses" using.screen_loc = ui_glasses using.layer = 19 @@ -224,6 +249,7 @@ using = new src.h_type( src ) using.name = "ears" + using.icon = ui_style using.icon_state = "ears" using.screen_loc = ui_ears using.layer = 19 @@ -232,6 +258,7 @@ using = new src.h_type( src ) using.name = "head" + using.icon = ui_style using.icon_state = "hair" using.screen_loc = ui_head using.layer = 19 @@ -240,6 +267,7 @@ using = new src.h_type( src ) using.name = "shoes" + using.icon = ui_style using.icon_state = "shoes" using.screen_loc = ui_shoes using.layer = 19 @@ -248,6 +276,7 @@ using = new src.h_type( src ) using.name = "belt" + using.icon = ui_style using.icon_state = "belt" using.screen_loc = ui_belt using.layer = 19 @@ -309,6 +338,7 @@ using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "1,1 to 5,15" using.layer = 17 @@ -316,6 +346,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "5,1 to 10,5" using.layer = 17 @@ -323,6 +354,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "6,11 to 10,15" using.layer = 17 @@ -330,6 +362,7 @@ src.vimpaired += using using = new src.h_type( src ) using.name = null + using.icon = ui_style using.icon_state = "dither50" using.screen_loc = "11,1 to 15,15" using.layer = 17 @@ -337,11 +370,13 @@ src.vimpaired += using mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon.icon = ui_style mymob.throw_icon.icon_state = "act_throw_off" mymob.throw_icon.name = "throw" mymob.throw_icon.screen_loc = ui_throw mymob.oxygen = new /obj/screen( null ) + mymob.oxygen.icon = ui_style mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen @@ -359,60 +394,70 @@ */ mymob.toxin = new /obj/screen( null ) - mymob.toxin.icon = 'screen1.dmi' + mymob.toxin.icon = ui_style mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_toxin mymob.internals = new /obj/screen( null ) + mymob.internals.icon = ui_style mymob.internals.icon_state = "internal0" mymob.internals.name = "internal" mymob.internals.screen_loc = ui_internal mymob.fire = new /obj/screen( null ) + mymob.fire.icon = ui_style mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire mymob.bodytemp = new /obj/screen( null ) + mymob.bodytemp.icon = ui_style mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp mymob.healths = new /obj/screen( null ) + mymob.healths.icon = ui_style mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_health mymob.pullin = new /obj/screen( null ) + mymob.pullin.icon = ui_style mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull mymob.blind = new /obj/screen( null ) + mymob.blind.icon = ui_style mymob.blind.icon_state = "black" mymob.blind.name = " " mymob.blind.screen_loc = "1,1 to 15,15" mymob.blind.layer = 0 mymob.flash = new /obj/screen( null ) + mymob.flash.icon = ui_style mymob.flash.icon_state = "blank" mymob.flash.name = "flash" mymob.flash.screen_loc = "1,1 to 15,15" mymob.flash.layer = 17 mymob.hands = new /obj/screen( null ) + mymob.hands.icon = ui_style mymob.hands.icon_state = "hand" mymob.hands.name = "hand" mymob.hands.screen_loc = ui_hand mymob.hands.dir = NORTH mymob.sleep = new /obj/screen( null ) + mymob.sleep.icon = ui_style mymob.sleep.icon_state = "sleep0" mymob.sleep.name = "sleep" mymob.sleep.screen_loc = ui_sleep mymob.rest = new /obj/screen( null ) + mymob.rest.icon = ui_style mymob.rest.icon_state = "rest0" mymob.rest.name = "rest" mymob.rest.screen_loc = ui_rest diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 6e0c3d50293..b315bf962df 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -92,7 +92,7 @@ mob/new_player output += "
Observe
" - src << browse(output,"window=playersetup;size=250x200;can_close=0") + src << browse(output,"window=playersetup;size=250x210;can_close=0") Stat() ..() diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index f655c2ba916..dc06799569e 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -28,6 +28,8 @@ datum/preferences var/g_eyes = 0.0 var/b_eyes = 0.0 + var/UI = 'screen1_old.dmi' // Skie + var/icon/preview_icon = null New() @@ -150,6 +152,9 @@ datum/preferences dat += "Gender: [src.gender == MALE ? "Male" : "Female"]
" dat += "Age: [src.age]" + dat += "
" + dat += "UI Style: [src.UI == 'screen1.dmi' ? "New" : "Old"]
" + dat += "
Occupation Choices
" if (destructive.Find(src.occupation1)) dat += "\t[occupation1]
" @@ -225,7 +230,7 @@ datum/preferences dat += "Reset Setup
" dat += "" - user << browse(dat, "window=preferences;size=300x640") + user << browse(dat, "window=preferences;size=300x710") proc/SetChoices(mob/user, occ=1) var/HTML = "" @@ -250,7 +255,7 @@ datum/preferences HTML += "" user << browse(null, "window=preferences") - user << browse(HTML, "window=mob_occupation;size=320x500") + user << browse(HTML, "window=mob_occupation;size=320x600") return proc/SetJob(mob/user, occ=1, job="Captain") @@ -487,6 +492,12 @@ datum/preferences else src.gender = MALE + if (link_tags["UI"]) + if (src.UI == 'screen1.dmi') + src.UI = 'screen1_old.dmi' + else + src.UI = 'screen1.dmi' + if (link_tags["underwear"]) if(!IsGuestKey(user.key)) if (src.underwear == 1) @@ -532,6 +543,7 @@ datum/preferences b_eyes = 0.0 s_tone = 0.0 b_type = "A+" + UI = 'screen1_old.dmi' src.ShowChoices(user) @@ -563,6 +575,8 @@ datum/preferences character.h_style = h_style character.f_style = f_style + character.UI = UI + switch(h_style) if("Short Hair") character.hair_icon_state = "hair_a" diff --git a/icons/changelog.html b/icons/changelog.html index 0e2666ae59c..633d2f77755 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -35,7 +35,7 @@

Visit our IRC channel, #tgstation13 on irc.rizon.net

/tg/Station 13 Development Team
- Coders: TLE, NEO, muskets, veryinky, Skie, Numbers, Agouri, Noka
+ Coders: TLE, NEO, muskets, veryinky, Skie, Numbers, Agouri, Noka, Urist McDorf
Spriters: Skie, Agouri
Sounds: Skie
Thanks to: CDK Station devs, GoonStation devs and original SpaceStation developers @@ -45,9 +45,10 @@
Tuesday, September 21, 17:51