From 7c97361d86dbec1941a39db51c9178a9b22235e4 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Thu, 8 May 2014 00:52:04 -0500 Subject: [PATCH] Jobs you can't select are struckthrough instead of just being red. Before: It's going to be kinda confusing when a new player goes to setup their jobs and they see this: http://i.imgur.com/miK9Isk.png Specifically "unavailable occupations are in red" and then a list of days till they can play that role but also RED [NEVER] which to a new player migth cause confusion thinking they can never play that role. After: Remove the red and add a strikethrough ( http://i.imgur.com/BQ90xr6.png ) to show "these jobs are unavailable" while making the other jobs look, well more available. Conflicts: code/modules/client/preferences.dm --- code/modules/client/preferences.dm | 5 +++-- code/modules/mob/living/silicon/robot/laws.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e61c7da403d..cbcbdae1a3e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -369,6 +369,7 @@ datum/preferences var/HTML = "" HTML += "" + HTML += "Choose occupation chances Unavailable occupations are crossed out. " HTML += "\[Done\] " // Easier to press up here. HTML += "Left-click to raise an occupation preference, right-click to lower it. " HTML += "" @@ -399,11 +400,11 @@ datum/preferences HTML += "[rank] \[KARMA]" continue if(jobban_isbanned(user, rank)) - HTML += "[rank] \[BANNED]" + HTML += "[rank] \[BANNED]" continue if(!job.player_old_enough(user.client)) var/available_in_days = job.available_in_days(user.client) - HTML += "[rank] \[IN [(available_in_days)] DAYS]" + HTML += "[rank] \[IN [(available_in_days)] DAYS]" continue if((job_civilian_low & ASSISTANT) && (rank != "Assistant")) HTML += "[rank]" diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index 0b46c0df537..42365844823 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -102,7 +102,7 @@ /mob/living/silicon/proc/make_laws() switch(config.default_laws) - if(0) laws = new /datum/ai_laws/default/asimov() + if(0) laws = new /datum/ai_laws/asimov() if(1) laws = new /datum/ai_laws/custom() if(2) var/datum/ai_laws/lawtype = pick(typesof(/datum/ai_laws/default) - /datum/ai_laws/default)