Merge branch 'master220' into master220

code/modules/paperwork/faxmachine.dm

@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) //cache for faxes that have been sent to admins
 	insert_anim = "faxsend"
 	var/send_access = list(list(access_lawyer, access_bridge, access_armory, access_qm, access_heads, access_cent_general))
 
-	var/static/list/admin_departments = list("[GLOB.using_map.boss_name]", "Command of the 5th Fleet", "Sol Governmental Authority", "Sol-Gov Job Boards", "Sol-Gov Supply Departament", "FTU Agency")
+	var/static/list/admin_departments = list("[GLOB.using_map.boss_name]", "SFV Stinger Command Departament", "Sol Governmental Authority", "Sol-Gov Job Boards", "Sol-Gov Supply Departament", "FTU Agency")
 
 
 	idle_power_usage = 30

maps/away/ascent_caulship/ascent_jobs.dm

@@ -101,7 +101,7 @@
 	info = "You are a Gyne of the Ascent, fleeing the murderous Kharmaani political sphere after your first molt. Your search for safe harbour has brought you to this remote unsettled sector. Find a safe nest, and bring prosperity to your lineage."
 	outfit_type = /decl/hierarchy/outfit/job/ascent
 	blacklisted_species = null
-	whitelisted_species = list("Kharmaan Gyne")
+	whitelisted_species = list(SPECIES_MANTID_GYNE)
 	loadout_allowed = FALSE
 	is_semi_antagonist = TRUE
 	min_skill = list(
@@ -116,7 +116,7 @@
 	var/requires_supervisor = FALSE
 	var/set_species_on_join = SPECIES_MANTID_GYNE
 
-/datum/job/submap/ascent/is_position_available()
+/* /datum/job/submap/ascent/is_position_available()
 	. = ..()
 	if(. && requires_supervisor)
 		for(var/mob/M in GLOB.player_list)
@@ -125,7 +125,7 @@
 			var/datum/job/submap/ascent/ascent_job = M.mind.assigned_job
 			if(istype(ascent_job) && ascent_job.owner == owner)
 				return TRUE
-		return FALSE
+		return FALSE */
 
 /datum/job/submap/ascent/handle_variant_join(var/mob/living/carbon/human/H, var/alt_title)
 
@@ -169,8 +169,7 @@
 	info = "You are a young Alate of a new Gyne. She has led you to this remote sector to found a new nest. Follow her instructions and bring prosperity to your nest-lineage."
 	set_species_on_join = SPECIES_MANTID_ALATE
 	outfit_type = /decl/hierarchy/outfit/job/ascent/attendant
-	whitelisted_species = list("Kharmaan Alate")
-	requires_supervisor = "Ascent Gyne"
+	whitelisted_species = list(SPECIES_MANTID_ALATE)
 	min_skill = list(
 		SKILL_EVA = SKILL_ADEPT,
 		SKILL_HAULING = SKILL_ADEPT,
@@ -179,25 +178,26 @@
 		SKILL_MEDICAL = SKILL_BASIC
 	)
 	required_role = list("Ascent Gyne")
+	//requires_supervisor = "Ascent Gyne"
 
 /datum/job/submap/ascent/drone
 	title = "Ascent Drone"
 	supervisors = "the Gyne"
 	total_positions = 1
 	info = "You are a Machine Intelligence of an independent Ascent vessel. The Gyne you assist has fled her sisters, ending up in this sector full of primitive bioforms. Try to keep her alive, and assist where you can."
 	set_species_on_join = /mob/living/silicon/robot/flying/ascent
-	whitelisted_species = list("Kharmaan Alate")
-	requires_supervisor = "Ascent Gyne"
+	whitelisted_species = list(SPECIES_MANTID_ALATE)
 	required_role = list("Ascent Gyne")
+	//requires_supervisor = "Ascent Gyne"
 
 /datum/job/submap/ascent/worker
 	title = "Serpentid Adjunct"
 	supervisors = "the Serpentid Queen and the Gyne"
 	total_positions = 2
 	info = "You are a Monarch Serpentid Worker serving as an attendant to your Queen on this vessel. Serve her however she requires."
+	whitelisted_species = list(SPECIES_MANTID_ALATE, SPECIES_NABBER)
 	set_species_on_join = SPECIES_MONARCH_WORKER
 	outfit_type = /decl/hierarchy/outfit/job/ascent/worker/tech
-	requires_supervisor = "Serpentid Queen"
 	min_skill = list(SKILL_EVA = SKILL_ADEPT,
 					SKILL_HAULING = SKILL_ADEPT,
 					SKILL_COMBAT = SKILL_ADEPT,
@@ -206,23 +206,25 @@
 					SKILL_MEDICAL = SKILL_BASIC
 	)
 	required_role = list("Serpentid Queen")
+	//requires_supervisor = "Serpentid Queen"
 
 /datum/job/submap/ascent/queen
 	title = "Serpentid Queen"
-	supervisors = "the Gyne"
+	supervisors = "the Gyne"	
 	total_positions = 1
 	info = "You are a Monarch Serpentid Queen living on an independant Ascent vessel. Assist the Gyne in her duties and tend to your Workers."
 	set_species_on_join = SPECIES_MONARCH_QUEEN
 	outfit_type = /decl/hierarchy/outfit/job/ascent/queen
-	whitelisted_species = list("Kharmaan Gyne")
-	requires_supervisor = "Ascent Gyne"
+	whitelisted_species = list(SPECIES_MANTID_GYNE, SPECIES_NABBER)
 	min_skill = list(SKILL_EVA = SKILL_ADEPT,
 					SKILL_HAULING = SKILL_ADEPT,
 					SKILL_COMBAT = SKILL_ADEPT,
 					SKILL_WEAPONS = SKILL_ADEPT,
 					SKILL_MEDICAL = SKILL_BASIC
 	)
 	required_role = list("Ascent Gyne")
+	//requires_supervisor = "Ascent Gyne"
+
 
 // Spawn points.
 /obj/effect/submap_landmark/spawnpoint/ascent_caulship

maps/away_inf/sentinel/sentinel_crew.dm

@@ -58,9 +58,9 @@
 	branch = /datum/mil_branch/army
 	allowed_branches = list(/datum/mil_branch/army)
 	allowed_ranks = list(
-		/datum/mil_rank/army/e5,
 		/datum/mil_rank/army/e4,
-		/datum/mil_rank/army/e4_alt
+		/datum/mil_rank/army/e4_alt,
+		/datum/mil_rank/army/e5
 	)
 	supervisors = "Army SCGSO Leader"
 	loadout_allowed = TRUE
@@ -86,8 +86,8 @@
 	branch = /datum/mil_branch/army
 	allowed_branches = list(/datum/mil_branch/army)
 	allowed_ranks = list(
-		/datum/mil_rank/army/o3,
-		/datum/mil_rank/army/o2
+		/datum/mil_rank/army/o2,
+		/datum/mil_rank/army/o3
 	)
 	supervisors = "Fleet Commander, Command of the Battle Group Bravo of the 5th fleet, SCGDF"
 	loadout_allowed = TRUE
@@ -113,8 +113,8 @@
 	branch = /datum/mil_branch/fleet
 	allowed_branches = list(/datum/mil_branch/fleet)
 	allowed_ranks = list(
-		/datum/mil_rank/fleet/o4,
-		/datum/mil_rank/fleet/o3
+		/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
@@ -138,8 +138,8 @@
 	branch = /datum/mil_branch/fleet
 	allowed_branches = list(/datum/mil_branch/fleet)
 	allowed_ranks = list(
-		/datum/mil_rank/fleet/o2,
-		/datum/mil_rank/fleet/o1
+		/datum/mil_rank/fleet/o1,
+		/datum/mil_rank/fleet/o2
 	)
 	supervisors = "Fleet Commander"
 	loadout_allowed = TRUE
@@ -191,9 +191,9 @@
 	branch = /datum/mil_branch/fleet
 	allowed_branches = list(/datum/mil_branch/fleet)
 	allowed_ranks = list(
-		/datum/mil_rank/fleet/e6,
+		/datum/mil_rank/fleet/e4,
 		/datum/mil_rank/fleet/e5,
-		/datum/mil_rank/fleet/e4
+		/datum/mil_rank/fleet/e6
 	)
 	supervisors = "Fleet Pilot, Fleet Commander"
 	loadout_allowed = TRUE
@@ -230,7 +230,10 @@
 		/datum/mil_rank/fleet/o1,
 		/datum/mil_rank/fleet/o2,
 		/datum/mil_rank/fleet/o3,
-		/datum/mil_rank/fleet/o4
+		/datum/mil_rank/fleet/o4,
+		/datum/mil_rank/fleet/o5,
+		/datum/mil_rank/fleet/o6,
+		/datum/mil_rank/fleet/o7
 	)
 	spawn_rank_types = list(
 		/datum/mil_rank/fleet/e4,
@@ -239,7 +242,10 @@
 		/datum/mil_rank/fleet/o1,
 		/datum/mil_rank/fleet/o2,
 		/datum/mil_rank/fleet/o3,
-		/datum/mil_rank/fleet/o4
+		/datum/mil_rank/fleet/o4,
+		/datum/mil_rank/fleet/o5,
+		/datum/mil_rank/fleet/o6,
+		/datum/mil_rank/fleet/o7
 	)
 
 /datum/mil_rank/grade()
@@ -292,6 +298,24 @@
 	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"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o6, /obj/item/clothing/accessory/solgov/specialty/officer)
+	sort_order = 16
+
+/datum/mil_rank/fleet/o7
+	name = "Commodore"
+	name_short = "CDRE"
+	accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/flag, /obj/item/clothing/accessory/solgov/specialty/officer)
+	sort_order = 17
+
 /datum/mil_branch/army
 	name = "SCG Army"
 	name_short = "SCGA"
@@ -409,24 +433,26 @@
 /decl/hierarchy/outfit/job/patrol/centcom/bridge_officer
 	name = PATROL_OUTFIT_JOB_NAME("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/command/away_solpatrol/bridge_officer
+	suit = /obj/item/clothing/suit/storage/solgov/service/fleet/officer/away_solpatrol
 	r_pocket = /obj/item/card/id/syndicate
-	l_pocket = /obj/item/clothing/accessory/solgov/rank/fleet/officer
+	l_pocket = /obj/item/clothing/head/solgov/dress/fleet/command
 	id_types = list(/obj/item/card/id/centcom/NtPass/station)
 	id_pda_assignment = "5th Fleet Bridge Officer"
 
 /decl/hierarchy/outfit/job/patrol/centcom/comms_officer
 	name = PATROL_OUTFIT_JOB_NAME("Communications Officer")
-	head = /obj/item/clothing/head/solgov/dress/fleet
+	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/comms_officer
+	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/beret/solgov/fleet/command
 	id_types = list(/obj/item/card/id/centcom/NtPass/station)
@@ -435,12 +461,13 @@
 /decl/hierarchy/outfit/job/patrol/centcom/commanding_officer
 	name = PATROL_OUTFIT_JOB_NAME("Commanding 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/commanding_officer
+	suit = /obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol
 	r_pocket = /obj/item/card/id/syndicate
-	l_pocket = /obj/item/clothing/accessory/solgov/rank/fleet/flag
 	id_types = list(/obj/item/card/id/centcom/NtPass/station)
 	id_pda_assignment = "5th Fleet Commanding Officer"
 

maps/away_inf/sentinel/sentinel_items.dm

@@ -99,21 +99,15 @@
 		/obj/item/clothing/accessory/solgov/fleet_patch/fifth
 	)
 
-/obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol/bridge_officer
+/obj/item/clothing/suit/storage/solgov/service/fleet/officer/away_solpatrol
 	starting_accessories = list(
-		/obj/item/clothing/accessory/solgov/rank/fleet/officer/o2,
+		/obj/item/clothing/accessory/chameleon,
 		/obj/item/clothing/accessory/solgov/specialty/officer
 	)
 
-/obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol/comms_officer
+/obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol
 	starting_accessories = list(
-		/obj/item/clothing/accessory/solgov/rank/fleet/officer/o4,
-		/obj/item/clothing/accessory/solgov/specialty/officer
-	)
-
-/obj/item/clothing/suit/storage/solgov/service/fleet/command/away_solpatrol/commanding_officer
-	starting_accessories = list(
-		/obj/item/clothing/accessory/solgov/rank/fleet/officer/o6,
+		/obj/item/clothing/accessory/chameleon,
 		/obj/item/clothing/accessory/solgov/specialty/officer
 	)
 

maps/sierra/sierra-4.dmm

@@ -17530,7 +17530,9 @@
 "rSU" = (
 /obj/structure/table/steel_reinforced,
 /obj/effect/floor_decal/corner/black/mono,
-/obj/machinery/photocopier/faxmachine/centcomm,
+/obj/machinery/photocopier/faxmachine/centcomm{
+	department = "SFV Stinger Command Departament"
+	},
 /turf/unsimulated/floor/techfloor{
 	icon_state = "monotiledark";
 	icon = 'icons/turf/flooring/tiles.dmi'