cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3432 from Tastyfish/support-manifest

Browse Source 
Adds Supply section to manifest
This commit is contained in:
TheDZD
2016-01-29 21:03:02 -05:00
parent 60593e374f 37277fb21c
commit aea371f60b
9 changed files with 134 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nations/nations.dm
+5 -23
View File
@@ -102,7 +102,7 @@ datum/game_mode/nations
H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!"
continue
if(H.mind.assigned_role in support_positions)
if(H.mind.assigned_role in (support_positions + command_positions))
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
update_nations_icons_added(H,"hudcommand")
H.mind.nation.membership += H.mind.current
@@ -113,16 +113,6 @@ datum/game_mode/nations
H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!"
continue
if(H.mind.assigned_role in command_positions)
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
update_nations_icons_added(H,"hudcommand")
H.mind.nation.membership += H.mind.current
if(H.mind.assigned_role == H.mind.nation.default_leader)
H.mind.nation.current_leader = H.mind.current
H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!"
continue
H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!"
continue
if(H.mind.assigned_role in civilian_positions)
H << "You do not belong to any nation and are free to sell your services to the highest bidder."
continue
@@ -182,8 +172,6 @@ datum/game_mode/nations
if(!mode.kickoff) return 1
var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner")
var/list/servicion = list("Clown", "Mime", "Bartender", "Chef", "Botanist")
if(H.mind)
if(H.mind.assigned_role in engineering_positions)
H.mind.nation = all_nations["Atmosia"]
@@ -213,33 +201,27 @@ datum/game_mode/nations
H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
return 1
if(H.mind.assigned_role in cargonians)
if(H.mind.assigned_role in mode.cargonians)
H.mind.nation = all_nations["Cargonia"]
mode.update_nations_icons_added(H,"hudcargonia")
H.mind.nation.membership += H.mind.current
H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
return 1
if(H.mind.assigned_role in servicion)
if(H.mind.assigned_role in mode.servicion)
H.mind.nation = all_nations["Servicion"]
mode.update_nations_icons_added(H,"hudservice")
H.mind.nation.membership += H.mind.current
H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
return 1
if(H.mind.assigned_role in support_positions)
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
mode.update_nations_icons_added(H,"hudcommand")
H.mind.nation.membership += H.mind.current
H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
return 1
if(H.mind.assigned_role in command_positions)
if(H.mind.assigned_role in (support_positions + command_positions))
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
mode.update_nations_icons_added(H,"hudcommand")
H.mind.nation.membership += H.mind.current
H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
return 1
if(H.mind.assigned_role in civilian_positions)
H << "You do not belong to any nation and are free to sell your services to the highest bidder."
return 1
code/game/jobs/jobs.dm
+9
View File
@@ -116,6 +116,15 @@ var/list/support_positions = list(
"Blueshield"
)
var/list/supply_positions = list(
"Head of Personnel",
"Quartermaster",
"Cargo Technician",
"Shaft Miner"
)
var/list/service_positions = support_positions - supply_positions + list("Head of Personnel")
var/list/security_positions = list(
"Head of Security",
code/game/objects/effects/datacore-effect.dm
+30 -13
View File
@@ -18,7 +18,8 @@
var/list/eng = new()
var/list/med = new()
var/list/sci = new()
var/list/supp = new()
var/list/ser = new()
var/list/sup = new()
var/list/bot = new()
var/list/misc = new()
var/list/isactive = new()
@@ -67,8 +68,11 @@
if(real_rank in science_positions)
sci[name] = rank
department = 1
if(real_rank in support_positions)
supp[name] = rank
if(real_rank in service_positions)
ser[name] = rank
department = 1
if(real_rank in supply_positions)
sup[name] = rank
department = 1
if(real_rank in nonhuman_positions)
bot[name] = rank
@@ -100,10 +104,15 @@
for(name in sci)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
even = !even
if(supp.len > 0)
dat += "<tr><th colspan=3>Support</th></tr>"
for(name in supp)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[supp[name]]</td><td>[isactive[name]]</td></tr>"
if(ser.len > 0)
dat += "<tr><th colspan=3>Service</th></tr>"
for(name in ser)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[ser[name]]</td><td>[isactive[name]]</td></tr>"
even = !even
if(sup.len > 0)
dat += "<tr><th colspan=3>Supply</th></tr>"
for(name in sup)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sup[name]]</td><td>[isactive[name]]</td></tr>"
even = !even
// in case somebody is insane and added them to the manifest, why not
if(bot.len > 0)
@@ -142,7 +151,8 @@ var/global/ManifestJSON
var/eng[0]
var/med[0]
var/sci[0]
var/supp[0]
var/ser[0]
var/sup[0]
var/bot[0]
var/misc[0]
for(var/datum/data/record/t in data_core.general)
@@ -183,11 +193,17 @@ var/global/ManifestJSON
if(depthead && sci.len != 1)
sci.Swap(1,sci.len)
if(real_rank in support_positions)
supp[++supp.len] = list("name" = name, "rank" = rank, "active" = isactive)
if(real_rank in service_positions)
ser[++ser.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
if(depthead && supp.len != 1)
supp.Swap(1,supp.len)
if(depthead && ser.len != 1)
ser.Swap(1,ser.len)
if(real_rank in supply_positions)
sup[++sup.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
if(depthead && sup.len != 1)
sup.Swap(1,sup.len)
if(real_rank in nonhuman_positions)
bot[++bot.len] = list("name" = name, "rank" = rank, "active" = isactive)
@@ -203,7 +219,8 @@ var/global/ManifestJSON
"eng" = eng,\
"med" = med,\
"sci" = sci,\
"supp" = supp,\
"ser" = ser,\
"sup" = sup,\
"bot" = bot,\
"misc" = misc\
)
nano/assets/nanoui.css
+1 -1
View File
File diff suppressed because one or more lines are too long
nano/styles/_bars.less
+4 -4
View File
@@ -33,7 +33,7 @@
.displayBarFill.good {
color: #ffffff;
background: #4f7529;
background: @good-color;
}
.displayBarFill.notgood {
@@ -43,15 +43,15 @@
.displayBarFill.average {
color: #ffffff;
background: #cd6500;
background: @average-color;
}
.displayBarFill.bad {
color: #ffffff;
background: #ee0000;
background: @bad-color;
}
.displayBarFill.highlight {
color: #ffffff;
background: #8BA5C4;
background: @highlight-color;
}
nano/styles/_color.less
+13 -6
View File
@@ -1,25 +1,32 @@
@good-color: #4f7529;
@average-color: #cd6500;
@bad-color: #ee0000;
@highlight-color: #8BA5C4;
@dark-color: #272727;
.white {
color: white;
font-weight: bold;
}
.good {
color: #4f7529;
color: @good-color;
font-weight: bold;
}
.average {
color: #cd6500;
color: @average-color;
font-weight: bold;
}
.bad {
color: #ee0000;
color: @bad-color;
font-weight: bold;
}
.idle {
color: #272727;
color: @dark-color;
font-weight: bold;
}
@@ -32,11 +39,11 @@
}
.highlight {
color: #8BA5C4;
color: @highlight-color;
}
.dark {
color: #272727;
color: @dark-color;
}
/* Damage colors for crew monitoring computer */
nano/styles/_lists.less
+24 -19
View File
@@ -27,46 +27,51 @@ table.pmon td, table.pmon th {
}
/* Table styling for the crew manifest */
th.command {
background: #3333FF;
.manifest-header(@color: #666) {
background: @color;
font-weight: bold;
color: #ffffff;
}
th.command {
.manifest-header(#3333FF);
}
th.sec {
background: #8e0000;
font-weight: bold;
color: #ffffff;
.manifest-header(#8e0000);
}
th.med {
background: #006600;
font-weight: bold;
color: #ffffff;
.manifest-header(#006600);
}
th.eng {
background: #b27300;
font-weight: bold;
color: #ffffff;
.manifest-header(#b27300);
}
th.sci {
background: #a65ba6;
font-weight: bold;
color: #ffffff;
.manifest-header(#a65ba6);
}
th.ser {
.manifest-header(#7100AA);
}
th.sup {
.manifest-header(#666621);
}
th.civ {
background: #a32800;
font-weight: bold;
color: #ffffff;
.manifest-header(#a32800);
}
th.misc {
background: #666666;
.manifest-header;
}
span.qm-job {
color: mix(@highlight-color, @average-color, 33%);
font-weight: bold;
color: #ffffff;
}
/* Striped lines for tables and divs */
nano/templates/pai_manifest.tmpl
+33 -21
View File
@@ -45,27 +45,39 @@ Copy-pasted from pda.tmpl
<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 data.manifest.sci}}
<tr><th colspan="3" class="sci">Science</th></tr>
{{for data.manifest["sci"]}}
{{if value.rank == "Research Director"}}
<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 data.manifest.supp}}
<tr><th colspan="3" class="supp">Support</th></tr>
{{for data.manifest["supp"]}}
{{if value.rank == "Head of Personnel"}}
<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.sci}}
<tr><th colspan="3" class="sci">Science</th></tr>
{{for data.manifest["sci"]}}
{{if value.rank == "Research Director"}}
<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 data.manifest.ser}}
<tr><th colspan="3" class="ser">Service</th></tr>
{{for data.manifest["ser"]}}
{{if value.rank == "Head of Personnel"}}
<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 data.manifest.sup}}
<tr><th colspan="3" class="sup">Supply</th></tr>
{{for data.manifest["sup"]}}
{{if value.rank == "Head of Personnel"}}
<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 value.rank == "Quartermaster"}}
<tr><td><span class="qm-job">{{:value.name}}</span></td><td><span class="qm-job">{{:value.rank}}</span></td><td><span class="qm-job">{{: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 data.manifest.civ}}
<tr><th colspan="3" class="civ">Civilian</th></tr>
{{for data.manifest["civ"]}}
nano/templates/pda.tmpl
+15 -3
View File
@@ -428,9 +428,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{/if}}
{{/for}}
{{/if}}
{{if data.manifest.supp}}
<tr><th colspan="3" class="supp">Support</th></tr>
{{for data.manifest["supp"]}}
{{if data.manifest.ser}}
<tr><th colspan="3" class="ser">Service</th></tr>
{{for data.manifest["ser"]}}
{{if value.rank == "Head of Personnel"}}
<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}}
@@ -438,6 +438,18 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{/if}}
{{/for}}
{{/if}}
{{if data.manifest.sup}}
<tr><th colspan="3" class="sup">Supply</th></tr>
{{for data.manifest["sup"]}}
{{if value.rank == "Head of Personnel"}}
<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 value.rank == "Quartermaster"}}
<tr><td><span class="qm-job">{{:value.name}}</span></td><td><span class="qm-job">{{:value.rank}}</span></td><td><span class="qm-job">{{: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 data.manifest.civ}}
<tr><th colspan="3" class="civ">Civilian</th></tr>
{{for data.manifest["civ"]}}