Fix millittary branches and add some Fleet millitary ranks (#1247)

SierraBay · Oct 31, 2023 · 963c1cf · 963c1cf
1 parent 9d68de1
commit 963c1cf
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 21 deletions.
diff --git a/maps/sierra/job/jobs_security.dm b/maps/sierra/job/jobs_security.dm
@@ -56,7 +56,8 @@
 	supervisors = "Главе Службы безопасности"
 	economic_power = 5
 	minimal_player_age = 7
-	ideal_character_age = 35
+	minimum_character_age = list(SPECIES_HUMAN = 25)
+	ideal_character_age = 30
 	skill_points = 14
 	alt_titles = list(
 		"Forensic Technician"
@@ -98,6 +99,7 @@
 	supervisors = "Главе Службы безопасности и Смотрителю (сержанту)"
 	economic_power = 6
 	minimal_player_age = 10
+	minimum_character_age = list(SPECIES_HUMAN = 22)
 	ideal_character_age = 25
 	alt_titles = list("Junior Guard")
 
@@ -139,6 +141,7 @@
 	spawn_positions = 2
 	supervisors = "Главе Службы безопасности и остальному охранному персоналу"
 	economic_power = 3
+	minimum_character_age = list(SPECIES_HUMAN = 20)
 	ideal_character_age = 21
 	selection_color = "#601c1c"
 	alt_titles = list("Security Recruit")

diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm
@@ -104,7 +104,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_droptroops
 	allowed_branches = list(/datum/mil_branch/iccgn)
 	allowed_ranks = list(/datum/mil_rank/iccgn/or3)
-	supervisors = "sergeant"
+	supervisors = "Starszy Bosman"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -124,13 +124,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	access = list(access_away_iccgn, access_away_iccgn_droptroops, access_engine_equip)
 
 /datum/job/submap/away_iccgn_farfleet/iccgn_sergeant
-	title = "Pioneer Corps Sergeant"
+	title = "Pioneer Corps Starszy Bosman"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_sergeant
 	supervisors = "Recon captain, Command of the Pioneer Corps , ICCGN"
 	minimum_character_age = list(SPECIES_HUMAN = 23)
 	ideal_character_age = 25
-	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_branches = list(/datum/mil_branch/iccgn)
 	allowed_ranks = list(/datum/mil_rank/iccgn/or5)
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
@@ -158,10 +158,11 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_captain
 	minimum_character_age = list(SPECIES_HUMAN = 36)
 	ideal_character_age = 40
-	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_branches = list(/datum/mil_branch/iccgn)
 	allowed_ranks = list(
 		/datum/mil_rank/iccgn/of4,
-		/datum/mil_rank/iccgn/of5)
+		/datum/mil_rank/iccgn/of5
+	)
 	supervisors = "command of the Pioneer Corps , ICCGN"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
@@ -189,11 +190,11 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_medic
 	minimum_character_age = list(SPECIES_HUMAN = 26)
 	ideal_character_age = 30
-	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_branches = list(/datum/mil_branch/iccgn)
 	allowed_ranks = list(
 		/datum/mil_rank/iccgn/of1,
-		/datum/mil_rank/iccgn/of2,
-		/datum/mil_rank/iccgn/of3)
+		/datum/mil_rank/iccgn/of3
+	)
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Являясь одним из членов экипажа разведывательного корабля Пионерского Корпуса ГКК, ваша задача состоит в медицинской поддержке экипажа. \
@@ -219,11 +220,11 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	title = "Pioneer Corps Technician"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_gunner
-	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_branches = list(/datum/mil_branch/iccgn)
 	allowed_ranks = list(
 		/datum/mil_rank/iccgn/of1,
-		/datum/mil_rank/iccgn/of2,
-		/datum/mil_rank/iccgn/of3)
+		/datum/mil_rank/iccgn/of3
+	)
 	minimum_character_age = list(SPECIES_HUMAN = 23)
 	ideal_character_age = 27
 	supervisors = "captain"

diff --git a/mods/_maps/sentinel/code/sentinel_crew.dm b/mods/_maps/sentinel/code/sentinel_crew.dm
@@ -79,6 +79,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	ideal_character_age = 25
 	allowed_branches = list(/datum/mil_branch/scga)
 	allowed_ranks = list(
+		/datum/mil_rank/scga/e4,
 		/datum/mil_rank/scga/e5
 		)
 	supervisors = "Army Captain"
@@ -106,7 +107,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	minimum_character_age = list(SPECIES_HUMAN = 25)
 	ideal_character_age = 27
 	allowed_branches = list(/datum/mil_branch/scga)
-	allowed_ranks = list(/datum/mil_rank/scga/o3)
+	allowed_ranks = list(
+		/datum/mil_rank/scga/o2,
+		/datum/mil_rank/scga/o3
+	)
 	supervisors = "Lieutenant Commander, Command of the Battle Group Bravo of the 5th fleet, SCGDF"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
@@ -134,7 +138,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	minimum_character_age = list(SPECIES_HUMAN = 30)
 	ideal_character_age = 33
 	allowed_branches = list(/datum/mil_branch/fleet)
-	allowed_ranks = list(/datum/mil_rank/fleet/o4)
+	allowed_ranks = list(
+		/datum/mil_rank/fleet/o3,
+		/datum/mil_rank/fleet/o4
+	)
 	supervisors = "Command of the Battle Group Bravo of the 5th fleet, SCGDF"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -160,7 +167,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	minimum_character_age = list(SPECIES_HUMAN = 23)
 	ideal_character_age = 25
 	allowed_branches = list(/datum/mil_branch/fleet)
-	allowed_ranks = list(/datum/mil_rank/fleet/o2)
+	allowed_ranks = list(
+		/datum/mil_rank/fleet/o1,
+		/datum/mil_rank/fleet/o2
+	)
 	supervisors = "Lieutenant Commander"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -186,8 +196,11 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	minimum_character_age = list(SPECIES_HUMAN = 26)
 	ideal_character_age = 30
 	allowed_branches = list(/datum/mil_branch/fleet)
-	allowed_ranks = list(/datum/mil_rank/fleet/o1)
-	supervisors = "Sub-Lieutenant, Lieutenant Commander"
+	allowed_ranks = list(
+		/datum/mil_rank/fleet/o1,
+		/datum/mil_rank/fleet/o2
+	)
+	supervisors = "Fleet Commander"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в медицинской поддержке экипажа. \
@@ -214,8 +227,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	minimum_character_age = list(SPECIES_HUMAN = 26)
 	ideal_character_age = 28
 	allowed_branches = list(/datum/mil_branch/fleet)
-	allowed_ranks = list(/datum/mil_rank/fleet/e6)
-	supervisors = "Sub-Lieutenant, Lieutenant Commander"
+	allowed_ranks = list(
+		/datum/mil_rank/fleet/e4,
+		/datum/mil_rank/fleet/e5,
+		/datum/mil_rank/fleet/e6
+		)
+	supervisors = "Fleet Commander"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в поддержании работоспособности судна и экипировки экипажа. \
@@ -246,18 +263,24 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	name_short = "SCGF"
 	email_domain = "fleet.mil"
 	rank_types = list(
+		/datum/mil_rank/fleet/e4,
+		/datum/mil_rank/fleet/e5,
 		/datum/mil_rank/fleet/e6,
 		/datum/mil_rank/fleet/o1,
 		/datum/mil_rank/fleet/o2,
+		/datum/mil_rank/fleet/o3,
 		/datum/mil_rank/fleet/o4,
 		/datum/mil_rank/fleet/o6,
 		/datum/mil_rank/fleet/o7,
 		/datum/mil_rank/fleet/o8
 	)
 	spawn_rank_types = list(
+		/datum/mil_rank/fleet/e4,
+		/datum/mil_rank/fleet/e5,
 		/datum/mil_rank/fleet/e6,
 		/datum/mil_rank/fleet/o1,
 		/datum/mil_rank/fleet/o2,
+		/datum/mil_rank/fleet/o3,
 		/datum/mil_rank/fleet/o4,
 		/datum/mil_rank/fleet/o6,
 		/datum/mil_rank/fleet/o7,
@@ -272,6 +295,18 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 		return "E[sort_order]"
 	return "O[sort_order - 10]"
 
+/datum/mil_rank/fleet/e4
+	name = "Petty Officer Third Class"
+	name_short = "PO3"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/solgov/specialty/enlisted)
+	sort_order = 4
+
+/datum/mil_rank/fleet/e5
+	name = "Petty Officer Second Class"
+	name_short = "PO2"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e5, /obj/item/clothing/accessory/solgov/specialty/enlisted)
+	sort_order = 5
+
 /datum/mil_rank/fleet/e6
 	name = "Petty Officer First Class"
 	name_short = "PO1"
@@ -290,6 +325,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o2, /obj/item/clothing/accessory/solgov/specialty/officer)
 	sort_order = 12
 
+/datum/mil_rank/fleet/o3
+	name = "Lieutenant"
+	name_short = "LT"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o3, /obj/item/clothing/accessory/solgov/specialty/officer)
+	sort_order = 13
+
 /datum/mil_rank/fleet/o4
 	name = "Lieutenant Commander"
 	name_short = "LCDR"
@@ -319,24 +360,52 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	name_short = "SCGA"
 	email_domain = "army.mil"
 	rank_types = list(
+		/datum/mil_rank/scga/e4,
 		/datum/mil_rank/scga/e5,
+		/datum/mil_rank/scga/o2,
 		/datum/mil_rank/scga/o3
 	)
 	spawn_rank_types = list(
+		/datum/mil_rank/scga/e4,
 		/datum/mil_rank/scga/e5,
+		/datum/mil_rank/scga/o2,
 		/datum/mil_rank/scga/o3
 	)
 
+/datum/mil_rank/scga/e4
+	name = "Corporal"
+	name_short = "Cpl"
+	accessory = list(
+		/obj/item/clothing/accessory/scga_rank/e4,
+		/obj/item/clothing/accessory/scga_badge/enlisted
+	)
+	sort_order = 4
+
 /datum/mil_rank/scga/e5
 	name = "Sergeant"
 	name_short = "SGT"
-	accessory = list(/obj/item/clothing/accessory/scga_badge/enlisted)
+	accessory = list(
+		/obj/item/clothing/accessory/scga_rank/e5,
+		/obj/item/clothing/accessory/scga_badge/enlisted
+	)
 	sort_order = 5
 
+/datum/mil_rank/scga/o2
+	name = "First Lieutenant"
+	name_short = "1Lt"
+	accessory = list(
+		/obj/item/clothing/accessory/scga_rank/o2,
+		/obj/item/clothing/accessory/scga_badge/officer
+	)
+	sort_order = 12
+
 /datum/mil_rank/scga/o3
 	name = "Captain"
 	name_short = "CAPT"
-	accessory = list(/obj/item/clothing/accessory/scga_badge/officer)
+	accessory = list(
+		/obj/item/clothing/accessory/scga_rank/o3,
+		/obj/item/clothing/accessory/scga_badge/officer
+		)
 	sort_order = 13
 
 /* OUTFITS