diff --git a/code/modules/mob/living/carbon/brain/hud.dm b/code/modules/mob/living/carbon/brain/hud.dm
index c5474c203f0..f104f0d92b9 100644
--- a/code/modules/mob/living/carbon/brain/hud.dm
+++ b/code/modules/mob/living/carbon/brain/hud.dm
@@ -1,6 +1,6 @@
/obj/hud/proc/brain_hud(var/ui_style='screen1_old.dmi')
- ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
blurry = new h_type( src )
blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index c8b02b433d8..1964c7d3eb9 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -1,6 +1,6 @@
/obj/hud/proc/human_hud(var/ui_style='screen1_old.dmi')
- ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
src.adding = list( )
src.other = list( )
@@ -522,7 +522,7 @@
mymob.oxygen.screen_loc = ui_oxygen
mymob.pressure = new /obj/screen( null )
- mymob.pressure.icon = 'screen1_old.dmi'
+ mymob.pressure.icon = ui_style
mymob.pressure.icon_state = "pressure0"
mymob.pressure.name = "pressure"
mymob.pressure.screen_loc = ui_pressure
diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm
index 719a05448f3..256368d0097 100644
--- a/code/modules/mob/living/carbon/monkey/hud.dm
+++ b/code/modules/mob/living/carbon/monkey/hud.dm
@@ -1,6 +1,6 @@
/obj/hud/proc/monkey_hud(var/ui_style='screen1_old.dmi')
- ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
src.adding = list( )
src.other = list( )
@@ -438,7 +438,7 @@
mymob.oxygen.screen_loc = ui_oxygen
mymob.pressure = new /obj/screen( null )
- mymob.pressure.icon = 'screen1_old.dmi'
+ mymob.pressure.icon = ui_style
mymob.pressure.icon_state = "pressure0"
mymob.pressure.name = "pressure"
mymob.pressure.screen_loc = ui_pressure
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index eb9b79d6dd3..cfa7db439da 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -259,7 +259,7 @@ the mob is also allowed to move without any sort of restriction. For instance, i
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
- var/UI = 'screen1_old.dmi' // For changing the UI from preferences
+ var/UI = 'screen1_Midnight.dmi' // For changing the UI from preferences
// var/obj/effect/organstructure/organStructure = null //for dem organs
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 83d84f520d0..244a980aa81 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -45,77 +45,77 @@ var/const
datum/preferences
- var
- real_name
- be_random_name = 0
- gender = MALE
- age = 30.0
- b_type = "A+"
+ var/real_name
+ var/be_random_name = 0
+ var/gender = MALE
+ var/age = 30.0
+ var/b_type = "A+"
//Special role selection
- be_special = 0
+ var/be_special = 0
//Play admin midis
- midis = 1
+ var/midis = 1
//Toggle ghost ears
- ghost_ears = 1
- ghost_sight = 1
+ var/ghost_ears = 1
+ var/ghost_sight = 1
//Saved changlog filesize to detect if there was a change
- lastchangelog = 0
+ var/lastchangelog = 0
//Just like it sounds
- ooccolor = "#b82e00"
- underwear = 1
- list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
- list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
- backbag = 2
- list/backbaglist = list("Nothing", "Backpack", "Satchel")
+ var/ooccolor = "#b82e00"
+ var/underwear = 1
+ var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
+ var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
+ var/backbag = 2
+ var/list/backbaglist = list("Nothing", "Backpack", "Satchel")
//Hair type
- h_style = "Short Hair"
- datum/sprite_accessory/hair/hair_style
+ var/h_style = "Short Hair"
+ var/datum/sprite_accessory/hair/hair_style
//Hair color
- r_hair = 0
- g_hair = 0
- b_hair = 0
+ var/r_hair = 0
+ var/g_hair = 0
+ var/b_hair = 0
//Face hair type
- f_style = "Shaved"
- datum/sprite_accessory/facial_hair/facial_hair_style
+ var/f_style = "Shaved"
+ var/datum/sprite_accessory/facial_hair/facial_hair_style
//Face hair color
- r_facial = 0
- g_facial = 0
- b_facial = 0
+ var/r_facial = 0
+ var/g_facial = 0
+ var/b_facial = 0
//Skin color
- s_tone = 0
+ var/s_tone = 0
//Eye color
- r_eyes = 0
- g_eyes = 0
- b_eyes = 0
+ var/r_eyes = 0
+ var/g_eyes = 0
+ var/b_eyes = 0
//UI style
- UI = UI_OLD
+ //UI = UI_OLD
+ var/UI_style = "Midnight"
//Mob preview
- icon/preview_icon_front = null
- icon/preview_icon_side = null
+ var/icon/preview_icon_front = null
+ var/icon/preview_icon_side = null
//Jobs, uses bitflags
- job_civilian_high = 0
- job_civilian_med = 0
- job_civilian_low = 0
+ var/job_civilian_high = 0
+ var/job_civilian_med = 0
+ var/job_civilian_low = 0
- job_medsci_high = 0
- job_medsci_med = 0
- job_medsci_low = 0
+ var/job_medsci_high = 0
+ var/job_medsci_med = 0
+ var/job_medsci_low = 0
- job_engsec_high = 0
- job_engsec_med = 0
- job_engsec_low = 0
+ var/job_engsec_high = 0
+ var/job_engsec_med = 0
+ var/job_engsec_low = 0
// OOC Metadata:
- metadata = ""
+ var/metadata = ""
New()
@@ -140,7 +140,7 @@ datum/preferences
dat += "Age: [age]"
dat += "
"
- //dat += "UI Style: [UI == UI_NEW ? "New" : "Old"]
" -- UI Style no longer a thing
+ dat += "UI Style: [UI_style]
"
dat += "Play admin midis: [midis == 1 ? "Yes" : "No"]
"
dat += "Ghost ears: [ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]
"
dat += "Ghost sight: [ghost_sight == 0 ? "Nearest Creatures" : "All Emotes"]
"
@@ -577,10 +577,15 @@ datum/preferences
gender = MALE
if(link_tags["UI"])
- if(UI == UI_OLD)
- UI = UI_NEW
- else
- UI = UI_OLD
+ switch(UI_style)
+ if("Midnight")
+ UI_style = "Orange"
+ if("Orange")
+ UI_style = "old"
+ if("old")
+ UI_style = "Midnight"
+ else
+ UI_style = "Midnight"
if(link_tags["midis"])
midis = !midis
@@ -662,7 +667,8 @@ datum/preferences
b_eyes = 0.0
s_tone = 0.0
b_type = "A+"
- UI = UI_OLD
+ //UI = UI_OLD
+ UI_style = "Midnight"
midis = 1
ghost_ears = 1
@@ -695,11 +701,15 @@ datum/preferences
character.h_style = h_style
character.f_style = f_style
- switch (UI)
- if(UI_OLD)
+ switch(UI_style)
+ if("Midnight")
+ character.UI = 'screen1_Midnight.dmi'
+ if("Orange")
+ character.UI = 'screen1_Orange.dmi'
+ if("old")
character.UI = 'screen1_old.dmi'
- if(UI_NEW)
- character.UI = 'screen1.dmi'
+ else
+ character.UI = 'screen1_Midnight.dmi'
character.hair_style = hair_style
character.facial_hair_style = facial_hair_style
diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm
index 32362e3bd05..ec3c195b081 100644
--- a/code/modules/mob/new_player/savefile.dm
+++ b/code/modules/mob/new_player/savefile.dm
@@ -54,7 +54,10 @@ datum/preferences/proc/savefile_save(mob/user)
F["be_special"] << src.be_special
- F["UI"] << src.UI
+ //F["UI"] << src.UI
+ if(isnull(UI_style))
+ UI_style = "Midnight"
+ F["UI_style"] << UI_style
F["midis"] << src.midis
F["ghost_ears"] << src.ghost_ears
F["ghost_sight"] << src.ghost_sight
@@ -115,7 +118,10 @@ datum/preferences/proc/savefile_load(mob/user)
if(isnull(ghost_sight)) ghost_sight = 1 //Hotfix
F["ooccolor"] >> src.ooccolor
F["lastchangelog"] >> src.lastchangelog
- F["UI"] >> src.UI
+ //F["UI"] >> src.UI
+ F["UI_style"] >> src.UI_style
+ if(isnull(UI_style))
+ UI_style = "Midnight"
F["be_special"] >> src.be_special
F["job_civilian_high"] >> src.job_civilian_high
diff --git a/html/changelog.html b/html/changelog.html
index f6a733c1923..6d6c4082cbc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,7 @@ should be listed in the changelog upon commit tho. Thanks. -->