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

Made HoP show up in supply too, with QM a third color

Browse Source
This commit is contained in:
Tastyfish
2016-01-29 15:03:26 -05:00
parent 511a9757de
commit 37277fb21c
8 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nations/nations.dm
+8 -24
View File
@@ -4,6 +4,7 @@ datum/game_mode/nations
required_players_secret = 25
var/kickoff = 0
var/victory = 0
var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner")
var/list/servicion = list("Clown", "Mime", "Bartender", "Chef", "Botanist", "Librarian", "Chaplain", "Barber")
@@ -79,7 +80,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 supply_positions)
if(H.mind.assigned_role in cargonians)
H.mind.nation = all_nations["Cargonia"]
update_nations_icons_added(H,"hudcargonia")
H.mind.nation.membership += H.mind.current
@@ -101,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
@@ -112,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
@@ -180,8 +171,7 @@ datum/game_mode/nations
if (!mode) return 1
if(!mode.kickoff) return 1
var/list/servicion = list("Clown", "Mime", "Bartender", "Chef", "Botanist", "Librarian", "Chaplain", "Barber")
if(H.mind)
if(H.mind.assigned_role in engineering_positions)
H.mind.nation = all_nations["Atmosia"]
@@ -211,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 supply_positions)
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
+2 -1
View File
@@ -117,12 +117,13 @@ var/list/support_positions = list(
)
var/list/supply_positions = list(
"Head of Personnel",
"Quartermaster",
"Cargo Technician",
"Shaft Miner"
)
var/list/service_positions = support_positions - supply_positions
var/list/service_positions = support_positions - supply_positions + list("Head of Personnel")
var/list/security_positions = list(