Merge pull request #3432 from Tastyfish/support-manifest

Adds Supply section to manifest

code/game/gamemodes/nations/nations.dm

@@ -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

@@ -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

@@ -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\
 		)