mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Cargo now sorts under their own department in the manifests.
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
var/list/eng = new()
|
var/list/eng = new()
|
||||||
var/list/med = new()
|
var/list/med = new()
|
||||||
var/list/sci = new()
|
var/list/sci = new()
|
||||||
|
var/list/car = new()
|
||||||
var/list/civ = new()
|
var/list/civ = new()
|
||||||
var/list/bot = new()
|
var/list/bot = new()
|
||||||
var/list/misc = new()
|
var/list/misc = new()
|
||||||
@@ -67,6 +68,9 @@
|
|||||||
if(real_rank in science_positions)
|
if(real_rank in science_positions)
|
||||||
sci[name] = rank
|
sci[name] = rank
|
||||||
department = 1
|
department = 1
|
||||||
|
if(real_rank in cargo_positions)
|
||||||
|
car[name] = rank
|
||||||
|
department = 1
|
||||||
if(real_rank in civilian_positions)
|
if(real_rank in civilian_positions)
|
||||||
civ[name] = rank
|
civ[name] = rank
|
||||||
department = 1
|
department = 1
|
||||||
@@ -100,6 +104,11 @@
|
|||||||
for(name in sci)
|
for(name in sci)
|
||||||
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
|
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
|
||||||
even = !even
|
even = !even
|
||||||
|
if(car.len > 0)
|
||||||
|
dat += "<tr><th colspan=3>Cargo</th></tr>"
|
||||||
|
for(name in car)
|
||||||
|
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[car[name]]</td><td>[isactive[name]]</td></tr>"
|
||||||
|
even = !even
|
||||||
if(civ.len > 0)
|
if(civ.len > 0)
|
||||||
dat += "<tr><th colspan=3>Civilian</th></tr>"
|
dat += "<tr><th colspan=3>Civilian</th></tr>"
|
||||||
for(name in civ)
|
for(name in civ)
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ var/global/ManifestJSON
|
|||||||
var/eng[0]
|
var/eng[0]
|
||||||
var/med[0]
|
var/med[0]
|
||||||
var/sci[0]
|
var/sci[0]
|
||||||
|
var/car[0]
|
||||||
var/civ[0]
|
var/civ[0]
|
||||||
var/bot[0]
|
var/bot[0]
|
||||||
var/misc[0]
|
var/misc[0]
|
||||||
@@ -114,6 +115,12 @@ var/global/ManifestJSON
|
|||||||
if(depthead && sci.len != 1)
|
if(depthead && sci.len != 1)
|
||||||
sci.Swap(1,sci.len)
|
sci.Swap(1,sci.len)
|
||||||
|
|
||||||
|
if(real_rank in cargo_positions)
|
||||||
|
car[++car.len] = list("name" = name, "rank" = rank, "active" = isactive)
|
||||||
|
department = 1
|
||||||
|
if(depthead && car.len != 1)
|
||||||
|
car.Swap(1,car.len)
|
||||||
|
|
||||||
if(real_rank in civilian_positions)
|
if(real_rank in civilian_positions)
|
||||||
civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive)
|
civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive)
|
||||||
department = 1
|
department = 1
|
||||||
@@ -134,6 +141,7 @@ var/global/ManifestJSON
|
|||||||
"eng" = eng,\
|
"eng" = eng,\
|
||||||
"med" = med,\
|
"med" = med,\
|
||||||
"sci" = sci,\
|
"sci" = sci,\
|
||||||
|
"car" = car,\
|
||||||
"civ" = civ,\
|
"civ" = civ,\
|
||||||
"bot" = bot,\
|
"bot" = bot,\
|
||||||
"misc" = misc\
|
"misc" = misc\
|
||||||
|
|||||||
@@ -86,6 +86,12 @@ var/list/science_positions = list(
|
|||||||
)
|
)
|
||||||
|
|
||||||
//BS12 EDIT
|
//BS12 EDIT
|
||||||
|
var/list/cargo_positions = list(
|
||||||
|
"Quartermaster",
|
||||||
|
"Cargo Technician",
|
||||||
|
"Shaft Miner"
|
||||||
|
)
|
||||||
|
|
||||||
var/list/civilian_positions = list(
|
var/list/civilian_positions = list(
|
||||||
"Head of Personnel",
|
"Head of Personnel",
|
||||||
"Bartender",
|
"Bartender",
|
||||||
@@ -93,9 +99,6 @@ var/list/civilian_positions = list(
|
|||||||
"Chef",
|
"Chef",
|
||||||
"Janitor",
|
"Janitor",
|
||||||
"Librarian",
|
"Librarian",
|
||||||
"Quartermaster",
|
|
||||||
"Cargo Technician",
|
|
||||||
"Shaft Miner",
|
|
||||||
"Lawyer",
|
"Lawyer",
|
||||||
"Chaplain",
|
"Chaplain",
|
||||||
"Assistant"
|
"Assistant"
|
||||||
|
|||||||
@@ -555,6 +555,12 @@ th.sci {
|
|||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
th.car {
|
||||||
|
background: #bb9040;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
th.civ {
|
th.civ {
|
||||||
background: #a32800;
|
background: #a32800;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|||||||
@@ -346,6 +346,16 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
|
|||||||
<tr><td><span class="average">{{:value.name}}</span></td><td><span class="average">{{:value.rank}}</span></td><td><span class="average">{{:value.active}}</span></td></tr>
|
<tr><td><span class="average">{{:value.name}}</span></td><td><span class="average">{{:value.rank}}</span></td><td><span class="average">{{:value.active}}</span></td></tr>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/for}}
|
{{/for}}
|
||||||
|
{{/if}}
|
||||||
|
{{if data.manifest.car.length}}
|
||||||
|
<tr><th colspan="3" class="car">Cargo</th></tr>
|
||||||
|
{{for data.manifest["car"]}}
|
||||||
|
{{if value.rank == "Quartermaster"}}
|
||||||
|
<tr><td><span class="good">{{:value.name}}</span></td><td><span class="good">{{:value.rank}}</span></td><td><span class="good">{{:value.active}}</span></td></tr>
|
||||||
|
{{else}}
|
||||||
|
<tr><td><span class="average">{{:value.name}}</span></td><td><span class="average">{{:value.rank}}</span></td><td><span class="average">{{:value.active}}</span></td></tr>
|
||||||
|
{{/if}}
|
||||||
|
{{/for}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{if data.manifest.civ.length}}
|
{{if data.manifest.civ.length}}
|
||||||
<tr><th colspan="3" class="civ">Civilian</th></tr>
|
<tr><th colspan="3" class="civ">Civilian</th></tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user