Updates Sentinel ship, fixes a few typos (#2433)

SierraBay · Jul 9, 2024 · 746269c · 746269c
1 parent 763d906
commit 746269c
Show file tree

Hide file tree

Showing 14 changed files with 724 additions and 711 deletions.
diff --git a/code/modules/submaps/submap_join.dm b/code/modules/submaps/submap_join.dm
@@ -70,9 +70,14 @@
 		var/mob/living/carbon/human/user_human
 		if(ishuman(character))
 			user_human = character
-			if(job.branch && GLOB.mil_branches)
+			// [SIERRA-EDIT]
+			if(user_human.client.prefs.branches[job.title])
+				user_human.char_branch = GLOB.mil_branches.get_branch(user_human.client.prefs.branches[job.title])
+				user_human.char_rank = GLOB.mil_branches.get_rank(user_human.client.prefs.branches[job.title], user_human.client.prefs.ranks[job.title])
+			else if (job.branch && GLOB.mil_branches)
 				user_human.char_branch = GLOB.mil_branches.get_branch(job.branch)
 				user_human.char_rank =   GLOB.mil_branches.get_rank(job.branch, job.rank)
+			// [/SIERRA-EDIT]
 
 			// We need to make sure to use the abstract instance here; it's not the same as the one we were passed.
 			character.skillset.obtain_from_client(SSjobs.get_by_path(job.type), character.client)

diff --git a/maps/sierra/machinery/machinery.dm b/maps/sierra/machinery/machinery.dm
@@ -182,7 +182,7 @@
 
 	if(href_list["secsend"])	//May cause some bad situations...
 		if (!destination)
-			visible_message("[src] beeps, \"No departament selected.\"")
+			visible_message("[src] beeps, \"No department selected.\"")
 			return
 		var/kek = user.client.holder
 		if (!istype(kek,/datum/admins))

diff --git a/maps/sierra/z6_admin.dmm b/maps/sierra/z6_admin.dmm
@@ -18263,7 +18263,7 @@
 "uvl" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/photocopier/faxmachine/centcomm{
-	department = "SFV Stinger Command Departament"
+	department = "SFV Stinger Command Department"
 	},
 /obj/floor_decal/corner/blue/mono,
 /turf/unsimulated/floor/techfloor{

diff --git a/mods/_maps/sentinel/code/sentinel_crew.dm b/mods/_maps/sentinel/code/sentinel_crew.dm
@@ -9,7 +9,7 @@
 	map = "Patrol Ship"
 	crew_jobs = list(
 		/datum/job/submap/patrol/commander,
-		/datum/job/submap/patrol/pilot1,
+		/datum/job/submap/patrol/pilot,
 		/datum/job/submap/patrol,
 		/datum/job/submap/patrol/captain,
 		/datum/job/submap/patrol/surgeon,
@@ -27,7 +27,7 @@
 /obj/submap_landmark/spawnpoint/away_patrol/commander
 	name = "Fleet Commander"
 
-/obj/submap_landmark/spawnpoint/away_patrol/pilot1
+/obj/submap_landmark/spawnpoint/away_patrol/pilot
 	name = "Fleet Pilot"
 
 /obj/submap_landmark/spawnpoint/away_patrol/surgeon
@@ -78,9 +78,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	allowed_branches = list(/datum/mil_branch/scga)
 	allowed_ranks = list(
 		/datum/mil_rank/scga/e4,
+		/datum/mil_rank/scga/e4_alt,
 		/datum/mil_rank/scga/e5
 		)
-	supervisors = "Army Captain"
+	supervisors = "Army Leader"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -102,8 +103,6 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	title = "Army SCGSO Leader"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/patrol/captain
-	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/o2,
@@ -156,10 +155,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	)
 	access = list(access_away_cavalry, access_away_cavalry_ops, access_away_cavalry_pilot, access_away_cavalry_fleet_armory, access_away_cavalry_commander)
 
-/datum/job/submap/patrol/pilot1
+/datum/job/submap/patrol/pilot
 	title = "Fleet Pilot"
 	total_positions = 1
-	outfit_type = /singleton/hierarchy/outfit/job/patrol/pilot1
+	outfit_type = /singleton/hierarchy/outfit/job/patrol/pilot
 	allowed_branches = list(/datum/mil_branch/fleet)
 	allowed_ranks = list(
 		/datum/mil_rank/fleet/o1,
@@ -192,7 +191,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 		/datum/mil_rank/fleet/o1,
 		/datum/mil_rank/fleet/o2
 	)
-	supervisors = "Fleet Commander"
+	supervisors = "Lieutenant Commander"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в медицинской поддержке экипажа. \
@@ -222,7 +221,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 		/datum/mil_rank/fleet/e5,
 		/datum/mil_rank/fleet/e6
 		)
-	supervisors = "Fleet Commander"
+	supervisors = "Lieutenant Commander"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в поддержании работоспособности судна и экипировки экипажа. \
@@ -249,7 +248,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
  */
 
 /datum/mil_branch/fleet
-	name = "SCG Fleet"
+	name = "Sol Central Government Fleet"
 	name_short = "SCGF"
 	email_domain = "fleet.mil"
 	rank_types = list(
@@ -260,6 +259,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 		/datum/mil_rank/fleet/o2,
 		/datum/mil_rank/fleet/o3,
 		/datum/mil_rank/fleet/o4,
+		/datum/mil_rank/fleet/o5,
 		/datum/mil_rank/fleet/o6,
 		/datum/mil_rank/fleet/o7,
 		/datum/mil_rank/fleet/o8
@@ -272,6 +272,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 		/datum/mil_rank/fleet/o2,
 		/datum/mil_rank/fleet/o3,
 		/datum/mil_rank/fleet/o4,
+		/datum/mil_rank/fleet/o5,
 		/datum/mil_rank/fleet/o6,
 		/datum/mil_rank/fleet/o7,
 		/datum/mil_rank/fleet/o8
@@ -327,6 +328,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o4, /obj/item/clothing/accessory/solgov/specialty/officer)
 	sort_order = 14
 
+/datum/mil_rank/fleet/o5
+	name = "Commander"
+	name_short = "CDR"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o5, /obj/item/clothing/accessory/solgov/specialty/officer)
+	sort_order = 15
+
 /datum/mil_rank/fleet/o6
 	name = "Captain"
 	name_short = "CAPT"
@@ -345,59 +352,6 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/flag/o8, /obj/item/clothing/accessory/solgov/specialty/officer)
 	sort_order = 18
 
-/datum/mil_branch/scga
-	name = "SCG Army"
-	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_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_rank/o3,
-		/obj/item/clothing/accessory/scga_badge/officer
-		)
-	sort_order = 13
-
 /* OUTFITS
  * =======
  */
@@ -423,16 +377,18 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 /singleton/hierarchy/outfit/job/patrol/army_ops
 	name = PATROL_OUTFIT_JOB_NAME("Ops")
 	head = /obj/item/clothing/head/scga/utility
-	uniform = /obj/item/clothing/under/scga/utility
+	uniform = /obj/item/clothing/under/scga/utility/away_solpatrol
 	id_types = list(/obj/item/card/id/awaycavalry/ops)
-	gloves = /obj/item/clothing/gloves/thick/combat
+	gloves = /obj/item/clothing/gloves/scga/duty
+	shoes = /obj/item/clothing/shoes/scga/utility/tan
 
 /singleton/hierarchy/outfit/job/patrol/captain
 	name = PATROL_OUTFIT_JOB_NAME("Captain")
-	head = /obj/item/clothing/head/scga/utility
-	uniform = /obj/item/clothing/under/scga/utility
+	head = /obj/item/clothing/head/scga/beret
+	uniform = /obj/item/clothing/under/scga/utility/away_solpatrol
 	id_types = list(/obj/item/card/id/awaycavalry/ops/captain)
 	gloves = /obj/item/clothing/gloves/thick/combat
+	shoes = /obj/item/clothing/shoes/scga/utility/tan
 
 /singleton/hierarchy/outfit/job/patrol/engineer
 	name = PATROL_OUTFIT_JOB_NAME("Technician")
@@ -449,26 +405,43 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER"
 /singleton/hierarchy/outfit/job/patrol/commander
 	name = PATROL_OUTFIT_JOB_NAME("Lieutenant Commander")
 	head = /obj/item/clothing/head/beret/solgov/fleet/branch/fifth
-	uniform = /obj/item/clothing/under/solgov/utility/fleet/officer/command/commander/away_solpatrol
+	uniform = /obj/item/clothing/under/solgov/utility/fleet/officer/command_away_solpatrol
 	belt = /obj/item/storage/belt/holster/security/tactical/away_solpatrol
 	id_types = list(/obj/item/card/id/awaycavalry/fleet/commander)
-	gloves = /obj/item/clothing/gloves/thick/duty/solgov/cmd
+	gloves = /obj/item/clothing/gloves/thick/duty/solgov/fleet
 
-/singleton/hierarchy/outfit/job/patrol/pilot1
+/singleton/hierarchy/outfit/job/patrol/pilot
 	name = PATROL_OUTFIT_JOB_NAME("Sub-Lieutenant")
 	head = /obj/item/clothing/head/beret/solgov/fleet/branch/fifth
-	uniform = /obj/item/clothing/under/solgov/utility/fleet/officer/pilot1/away_solpatrol
+	uniform = /obj/item/clothing/under/solgov/utility/fleet/officer/pilot_away_solpatrol
 	belt = /obj/item/storage/belt/holster/security/tactical/away_solpatrol
-	gloves = /obj/item/clothing/gloves/thick/duty
+	gloves = /obj/item/clothing/gloves/thick/duty/solgov/fleet
+
+/singleton/hierarchy/outfit/job/patrol/centcom
+	name = PATROL_OUTFIT_JOB_NAME("SFV Stinger Bridge Officer")
+	head = /obj/item/clothing/head/beret/solgov/fleet/branch/fifth
+	r_ear = /obj/item/device/radio/headset/away_scg_patrol
+	l_ear = /obj/item/device/radio/headset/headset_com/alt
+	uniform = /obj/item/clothing/under/solgov/service/fleet
+	belt = /obj/item/storage/belt/holster/general/away_solpatrol
+	shoes = /obj/item/clothing/shoes/dress
+	suit = /obj/item/clothing/suit/storage/solgov/service/fleet/officer/away_solpatrol
+	r_pocket = /obj/item/card/id/syndicate
+	l_pocket = /obj/item/clothing/head/solgov/dress/fleet/command
+	id_types = list(/obj/item/card/id/centcom/station)
+	id_pda_assignment = "5th Fleet Bridge Officer"
 
-/singleton/hierarchy/outfit/job/patrol/fleet_command
-	name = PATROL_OUTFIT_JOB_NAME("Senior Officer")
+/singleton/hierarchy/outfit/job/patrol/centcom/senior
+	name = PATROL_OUTFIT_JOB_NAME("SFV Stinger Senior Officer")
 	head = /obj/item/clothing/head/solgov/dress/fleet/command
+	r_ear = /obj/item/device/radio/headset/away_scg_patrol
+	l_ear = /obj/item/device/radio/headset/headset_com/alt
 	uniform = /obj/item/clothing/under/solgov/service/fleet
 	belt = /obj/item/storage/belt/holster/general/away_solpatrol
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol
 	r_pocket = /obj/item/card/id/syndicate
+	l_pocket = /obj/item/clothing/head/beret/solgov/fleet/command
 	id_types = list(/obj/item/card/id/centcom/station)
 	id_pda_assignment = "5th Fleet Senior Officer"
 

diff --git a/mods/_maps/sentinel/code/sentinel_items.dm b/mods/_maps/sentinel/code/sentinel_items.dm
@@ -63,13 +63,18 @@
  * ========
  */
 
-/obj/item/clothing/under/solgov/utility/fleet/officer/pilot1/away_solpatrol
+/obj/item/clothing/under/scga/utility/away_solpatrol
+	accessories = list(
+		/obj/item/clothing/accessory/solgov/army/tempest
+	)
+
+/obj/item/clothing/under/solgov/utility/fleet/officer/pilot_away_solpatrol
 	accessories = list(
 		/obj/item/clothing/accessory/solgov/specialty/pilot,
 		/obj/item/clothing/accessory/solgov/fleet_patch/fifth
 	)
 
-/obj/item/clothing/under/solgov/utility/fleet/officer/command/commander/away_solpatrol
+/obj/item/clothing/under/solgov/utility/fleet/officer/command_away_solpatrol
 	accessories = list(
 		/obj/item/clothing/accessory/solgov/department/command/fleet,
 		/obj/item/clothing/accessory/solgov/specialty/pilot,
@@ -94,9 +99,15 @@
 		/obj/item/clothing/accessory/solgov/fleet_patch/fifth
 	)
 
+/obj/item/clothing/suit/storage/solgov/service/fleet/officer/away_solpatrol
+	accessories = list(
+		/obj/item/clothing/accessory/chameleon,
+		/obj/item/clothing/accessory/solgov/specialty/officer
+	)
+
 /obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol
 	accessories = list(
-		/obj/item/clothing/accessory/solgov/rank/fleet/officer/o6,
+		/obj/item/clothing/accessory/chameleon,
 		/obj/item/clothing/accessory/solgov/specialty/officer
 	)
 
@@ -115,3 +126,15 @@
 	name = "SCG armband"
 	desc = "An armband, worn by the crew to display which country they represent. This one is blue and gold."
 	icon_state = "solblue"
+
+/obj/item/clothing/accessory/solgov/army/tempest
+	name = "Tempest Squad patch"
+	desc = "A tactical shoulder patch carrying insignia of Tempest Squad, the Special Operations Force of SCG Army."
+	icon = 'mods/_maps/sentinel/icons/obj/obj_accessories_solpatrol.dmi'
+	accessory_icons = list(
+		slot_w_uniform_str = 'mods/_maps/sentinel/icons/mob/onmob_accessories_solpatrol.dmi',
+		slot_wear_suit_str = 'mods/_maps/sentinel/icons/mob/onmob_accessories_solpatrol.dmi'
+	)
+	icon_state = "army_tempest"
+	on_rolled_down = ACCESSORY_ROLLED_NONE
+	slot = ACCESSORY_SLOT_INSIGNIA