"
for(var/datum/job/job_datum as anything in department.get_jobban_jobs())
if(break_counter > 0 && (break_counter % 3 == 0))
diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm
index 392822eac61..0f185490ac8 100644
--- a/code/modules/client/preferences/middleware/jobs.dm
+++ b/code/modules/client/preferences/middleware/jobs.dm
@@ -49,6 +49,7 @@
departments[department_name] = list(
"head" = department_head_type && initial(department_head_type.title),
+ "color" = department_type.ui_color, // Prob shouldnt be here.
)
jobs[job.title] = list(
diff --git a/code/modules/jobs/departments/departments.dm b/code/modules/jobs/departments/departments.dm
index 6a2d7633603..dd504653b8f 100644
--- a/code/modules/jobs/departments/departments.dm
+++ b/code/modules/jobs/departments/departments.dm
@@ -10,8 +10,6 @@
var/department_experience_type = null
/// The order in which this department appears on menus, in relation to other departments.
var/display_order = 0
- /// The header color to be displayed in the ban panel, classes defined in banpanel.css
- var/label_class = "undefineddepartment"
/// The color used in TGUI or similar menus.
var/ui_color = "#9689db"
/// Job singleton datums associated to this department. Populated on job initialization.
@@ -54,6 +52,10 @@
var/static/list/nation_suffixes = list("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka")
return pick(nation_prefixes) + pick(nation_suffixes)
+/// Returns a simplifed spaceless string for use in stuff like CSS.
+/datum/job_department/proc/get_label_class()
+ return LOWER_TEXT(replacetext(department_name, " ", "_"))
+
/// A special assistant only department, primarily for use by the preferences menu
/datum/job_department/assistant
department_name = DEPARTMENT_ASSISTANT
@@ -70,6 +72,7 @@
department_name = DEPARTMENT_CAPTAIN
department_bitflags = DEPARTMENT_BITFLAG_CAPTAIN
department_head = /datum/job/captain
+ ui_color = "#6681a5"
primary_work_area = /area/station/command
/datum/job_department/command
@@ -78,7 +81,6 @@
department_head = /datum/job/captain
department_experience_type = EXP_TYPE_COMMAND
display_order = 1
- label_class = "command"
ui_color = "#6681a5"
primary_work_area = /area/station/command
@@ -88,7 +90,6 @@
department_head = /datum/job/head_of_security
department_experience_type = EXP_TYPE_SECURITY
display_order = 2
- label_class = "security"
ui_color = "#d46a78"
nation_prefixes = list("Securi", "Beepski", "Shitcuri", "Red", "Stunba", "Flashbango", "Flasha", "Stanfordi")
primary_work_area = /area/station/security
@@ -111,7 +112,6 @@
department_head = /datum/job/chief_engineer
department_experience_type = EXP_TYPE_ENGINEERING
display_order = 3
- label_class = "engineering"
ui_color = "#dfb567"
nation_prefixes = list("Atomo", "Engino", "Power", "Teleco")
primary_work_area = /area/station/engineering
@@ -129,7 +129,6 @@
department_head = /datum/job/chief_medical_officer
department_experience_type = EXP_TYPE_MEDICAL
display_order = 4
- label_class = "medical"
ui_color = "#65b2bd"
nation_prefixes = list("Mede", "Healtha", "Recova", "Chemi", "Viro", "Psych")
primary_work_area = /area/station/medical
@@ -149,7 +148,6 @@
department_head = /datum/job/research_director
department_experience_type = EXP_TYPE_SCIENCE
display_order = 5
- label_class = "science"
ui_color = "#c973c9"
nation_prefixes = list("Sci", "Griffa", "Geneti", "Explosi", "Mecha", "Xeno", "Nani", "Cyto")
primary_work_area = /area/station/science
@@ -169,7 +167,6 @@
department_head = /datum/job/quartermaster
department_experience_type = EXP_TYPE_SUPPLY
display_order = 6
- label_class = "supply"
ui_color = "#cf9c6c"
nation_prefixes = list("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf")
primary_work_area = /area/station/cargo
@@ -182,7 +179,6 @@
department_head = /datum/job/head_of_personnel
department_experience_type = EXP_TYPE_SERVICE
display_order = 7
- label_class = "service"
ui_color = "#7cc46a"
nation_prefixes = list("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi")
primary_work_area = /area/station/service
@@ -197,7 +193,6 @@
department_head = /datum/job/ai
department_experience_type = EXP_TYPE_SILICON
display_order = 8
- label_class = "silicon"
ui_color = "#5dbda0"
/datum/job_department/silicon/generate_nation_name()
diff --git a/html/admin/banpanel.css b/html/admin/banpanel.css
index 8ad4f648e7a..33deafb6619 100644
--- a/html/admin/banpanel.css
+++ b/html/admin/banpanel.css
@@ -29,42 +29,10 @@
text-align: center;
}
-.command {
- background-color: #948f02;
-}
-
-.security {
- background-color: #a30000;
-}
-
-.engineering {
- background-color: #fb5613;
-}
-
-.medical {
- background-color: #337296;
-}
-
-.science {
- background-color: #993399;
-}
-
-.supply {
- background-color: #a8732b;
-}
-
-.silicon {
- background-color: #ff00ff;
-}
-
.abstract {
background-color: #708090;
}
-.service {
- background-color: #6eaa2c;
-}
-
.ghostandotherroles {
background-color: #5c00e6;
}
@@ -73,6 +41,6 @@
background-color: #6d3f40;
}
-.undefineddepartment {
+.no_department {
background-color: #111cf7;
}
diff --git a/tgui/packages/tgui/interfaces/CrewManifest.jsx b/tgui/packages/tgui/interfaces/CrewManifest.jsx
index af09ba11875..376a4d2df77 100644
--- a/tgui/packages/tgui/interfaces/CrewManifest.jsx
+++ b/tgui/packages/tgui/interfaces/CrewManifest.jsx
@@ -23,8 +23,9 @@ export const CrewManifest = (props) => {
{Object.entries(manifest).map(([dept, crew]) => (
+
{jobsForDepartment.map(([name, job]) => {
return (
* {
@@ -150,7 +135,6 @@ $department_map: (
background: hsla(0, 0%, 0%, 0.2);
height: 100%;
}
- }
&--Captain {
border: var(--border-thickness-medium)
@@ -167,7 +151,6 @@ $department_map: (
font-size: 17px;
}
}
- }
&__priority {
border: var(--border-thickness-tiny) solid hsla(0, 0%, 0%, 0.3);