many fixes, varedits, pred chunk clean up

code/__DEFINES/job.dm

@@ -379,6 +379,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_ARMY_LIST list(JOB_ARMY_TROOPER, JOB_ARMY_ENGI, JOB_ARMY_MEDIC, JOB_ARMY_MARKSMAN, JOB_ARMY_SMARTGUNNER, JOB_ARMY_SNCO, JOB_ARMY_CO, JOB_ARMY_SYN)
 
 //--US Aerospace Forces (USASF)--//
+#define JOB_USASF_ENLISTED "USASF Enlisted"
 #define JOB_USASF_CREW "USASF Ground Crew"
 #define JOB_USASF_CHAPLAIN "USASF Chaplain"
 #define JOB_USASF_HANGARTECH "USASF Hangar Technician"

code/datums/weather/weather_events/usasf_point_loma.dm

@@ -3,6 +3,7 @@
 	display_name = "High Heat"
 	length = 15 MINUTES // 15 minutes long, happens every 15 minutes
 	cleaning = FALSE
+	ambience = null
 
 	effect_message = "It is unbelievably hot. You can't wait to get indoors."
 
@@ -11,7 +12,8 @@
 	display_name = "Heat Wave"
 	length = 15 MINUTES
 	cleaning = FALSE
+	ambience = null
 
-	effect_message = "It is unbelievably, unbearably, hot. You are drowning in your own sweat, and you start to feel a little lightheaded"
-	damage_per_tick = 1
+	effect_message = "It is unbelievably, unbearably, hot. You start to feel lightheaded."
+	damage_per_tick = 0.01
 	damage_type = BURN

code/modules/clothing/under/rank_pins.dm

@@ -411,6 +411,7 @@
 	name = "rank boards"
 	rank_short = PAY_SHORT_NO10C
 	icon_state = "ranks_flagofficer"
+
 /*################################################
 ################# SPECIAL  #################
 ################################################*/
@@ -421,4 +422,5 @@
 
 /obj/item/clothing/accessory/ranks/navy/special/brassard
 	name = "rank brassard"
+	rank_short = "SP"
 	icon_state = "sp_brassard"

code/modules/gear_presets/corpses.dm

@@ -1943,36 +1943,37 @@
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/corpse/point_loma/alphatech/load_gear(mob/living/carbon/human/new_human)
-	var/outfit = rand (1,4)
+	var/outfit = rand(1,4)
 	switch(outfit) //ToDO: Parent equipping a radio
 		if(1) //Corpo Exec
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown, WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest, WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
-			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech, WEAR_L_EAR)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black, WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech(new_human), WEAR_L_EAR)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
 		if(2) //Scientist
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown, WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech, WEAR_L_EAR)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech(new_human), WEAR_L_EAR)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES)
 		if(3) //Miner
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_WAIST)
-			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech, WEAR_L_EAR)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo/safety, WEAR_EYES)
+			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech(new_human), WEAR_L_EAR)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo/safety(new_human), WEAR_EYES)
 		if(4) //Contractor
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/kutjevo(new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(new_human), WEAR_HEAD)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo(new_human), WEAR_EYES)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
-			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech, WEAR_L_EAR)
+			new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech(new_human), WEAR_L_EAR)
+
 
 /datum/equipment_preset/corpse/point_loma/alphatech/burst
 	name = "Corpse - Burst - Alphatech"
@@ -1984,77 +1985,75 @@
 	languages = list(LANGUAGE_ENGLISH)
 	idtype = /obj/item/card/id/dogtag/usasf
 	faction = FACTION_SURVIVOR
+	job_title  = JOB_USASF_ENLISTED
+	assignment = JOB_USASF_ENLISTED
 	faction_group = list(FACTION_MARINE, FACTION_SURVIVOR)
 	origin_override = ORIGIN_USASF
 	paygrades = list(PAY_SHORT_NE3 = JOB_PLAYTIME_TIER_0)
 	job_title  = JOB_USASF_CREW
-	access = list(
-		ACCESS_CIVILIAN_PUBLIC,
-		ACCESS_CIVILIAN_ENGINEERING,
-		ACCESS_CIVILIAN_LOGISTICS,
-	)
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/corpse/point_loma/usasf/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_usasf, WEAR_L_EAR)
 	var/duty = rand(1,10)
-	var/shoes = rand (1,3)
-	var/role = rand (1,4)
+	var/shoes = rand(1,3)
+	var/role = rand(1,4)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_usasf(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e3, WEAR_ACCESSORY)
+
 	switch(duty)
 		if(1 to 3) //off-duty
 			var/offduty_outfit = rand(1,3) //1 number per outfit
 			switch(offduty_outfit)
 				if (1)
-					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/frontier, WEAR_BODY)
+					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/frontier(new_human), WEAR_BODY)
 				if (2)
-					var/colour = rand (1,3)
+					var/colour = rand(1,3)
 					switch(colour)
 						if (1)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/blue, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/blue(new_human), WEAR_BODY)
 						if (2)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/brown, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/brown(new_human), WEAR_BODY)
 						if (3)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/gray, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/gray(new_human), WEAR_BODY)
 				if (3)
 					var/flavour = rand(1,3)
 					switch(flavour)
 						if (1)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br(new_human), WEAR_BODY)
 						if (2)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu(new_human), WEAR_BODY)
 						if(3)
-							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, WEAR_BODY)
+							new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla(new_human), WEAR_BODY)
 		if (4 to 10) //on-duty
 			var/onduty_outfit = rand(1,2)
 			switch(onduty_outfit)
 				if (1)
-					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy, WEAR_BODY)
+					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy(new_human), WEAR_BODY)
 				if (2)
-					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc, WEAR_BODY)
+					new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY)
 	switch(shoes)
 		if (1)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal, WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_human), WEAR_FEET)
 		if (2)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine, WEAR_FEET) //ToDO: USASF Boots
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) //ToDO: USASF Boots
 		if (3)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black, WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
 	switch(role)
 		if(1) // Engineer
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding, WEAR_HEAD)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest, WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped(new_human), WEAR_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
 		if(2) // Doctor
-			new_human.equip_to_slot_or_del (new /obj/item/clothing/suit/chef/classic/medical, WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
+			new_human.equip_to_slot_or_del (new /obj/item/clothing/suit/chef/classic/medical(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
 		if(3) // Security Police
-			var/obj/item/clothing/under/marine/navy/uniform = new()
-			var/obj/item/clothing/accessory/ranks/navy/special/brassard/patch_SP = new()
-			new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
-			uniform.attach_accessory(new_human,patch_SP)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/navy, WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/special/brassard(new_human), WEAR_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/navy(new_human), WEAR_HEAD)
 		if(4) // Pilot
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot, WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot/novisor, WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot/novisor(new_human), WEAR_HEAD)
 
 /datum/equipment_preset/corpse/point_loma/usasf/burst
 	name = "Corpse - Burst - USASF"

code/modules/gear_presets/survivors/usasf_point_loma/usasf_survivors.dm

@@ -212,23 +212,21 @@
 	job_title = JOB_USASF_CHAPLAIN
 	assignment = JOB_USASF_CHAPLAIN
 	survivor_variant = CIVILIAN_SURVIVOR
-	paygrades = list(PAY_SHORT_NO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_1)
+	paygrades = list(PAY_SHORT_NE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NE2 = JOB_PLAYTIME_TIER_1)
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/survivor/usasf/crew/duty/chaplain/load_gear(mob/living/carbon/human/new_human)
 	..()
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e1, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/duty/hangar_tech
 	name = "Survivor - USASF Hangar Technician"
 	job_title  = JOB_USASF_HANGARTECH
 	assignment = JOB_USASF_HANGARTECH
 	skills = /datum/skills/military/survivor/usasf/technician
-	paygrades = list(PAY_SHORT_NO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_1)
+	paygrades = list(PAY_SHORT_NE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NE2 = JOB_PLAYTIME_TIER_1)
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/survivor/usasf/crew/duty/hangar_tech/load_gear(mob/living/carbon/human/new_human)
@@ -237,48 +235,38 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS)
-	spawn_backpack(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e1, WEAR_ACCESSORY)
 
 
 /datum/equipment_preset/survivor/usasf/crew/duty/mess_tech
 	name = "Survivor - USASF Mess Technician"
 	survivor_variant = ENGINEERING_SURVIVOR
 	skills = /datum/skills/military/survivor/usasf/technician
-	paygrades = list(PAY_SHORT_NO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_1)
+	paygrades = list(PAY_SHORT_NE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NE2 = JOB_PLAYTIME_TIER_1)
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/survivor/usasf/crew/duty/mess_tech/load_gear(mob/living/carbon/human/new_human)
 	..()
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS)
-	spawn_backpack(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e1, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/duty/cargo_tech
 	name = "Survivor - USASF Cargo Technician"
 	job_title = JOB_USASF_CARGOTECH
 	assignment = JOB_USASF_CARGOTECH
 	survivor_variant = ENGINEERING_SURVIVOR
 	skills = /datum/skills/military/survivor/usasf/technician
-	paygrades = list(PAY_SHORT_NO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_1)
+	paygrades = list(PAY_SHORT_NE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NE2 = JOB_PLAYTIME_TIER_1)
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/survivor/usasf/crew/duty/cargo_tech/load_gear(mob/living/carbon/human/new_human)
 	..()
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS)
-	spawn_backpack(new_human)
-	spawn_helmet(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e1, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/medical //abstract
 	name = "Survivor - USASF Medical Staff"
@@ -302,14 +290,15 @@
 
 /datum/equipment_preset/survivor/usasf/crew/medical/nurse/load_gear(mob/living/carbon/human/new_human)
 	..()
-	spawn_backpack(new_human)
 	spawn_helmet(new_human)
+	spawn_armour(new_human)
+	spawn_backpack(new_human)
 	spawn_pouch(new_human)
 	spawn_food(new_human)
 	spawn_usasf_weapon(new_human)
-	spawn_armour(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_R_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/o2, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/medical/doctor
 	name = "Survivor - USASF Doctor"
@@ -320,15 +309,11 @@
 
 /datum/equipment_preset/survivor/usasf/crew/medical/doctor/load_gear(mob/living/carbon/human/new_human)
 	..()
-	spawn_backpack(new_human)
-	spawn_helmet(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
 	new_human.equip_to_slot_or_del (new /obj/item/clothing/suit/chef/classic/medical, WEAR_BODY)
 	new_human.equip_to_slot_or_del (new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_R_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/o3, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/security
 	name = "Survivor - USASF Security Police"
@@ -355,6 +340,7 @@
 	var/obj/item/clothing/accessory/ranks/navy/special/brassard/patch_SP = new()
 	new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
 	uniform.attach_accessory(new_human,patch_SP)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e3, WEAR_ACCESSORY)
 
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/navy, WEAR_HEAD)
 	spawn_security_primary(new_human)
@@ -384,6 +370,7 @@
 	..()
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/MP/SO, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/o2, WEAR_ACCESSORY)
 	spawn_security_primary(new_human)
 	spawn_armour(new_human)
 	spawn_backpack(new_human)
@@ -402,6 +389,7 @@
 	..()
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot/novisor, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/o3, WEAR_ACCESSORY)
 
 /datum/equipment_preset/survivor/usasf/crew/officer/co
 	name = "Survivor - USASF Aerospace Base Commander"
@@ -415,6 +403,7 @@
 	..()
 	new_human.equip_to_slot_or_del (new /obj/item/device/binoculars/range/designator, WEAR_R_HAND)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/mtr6m/full, WEAR_L_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/o5, WEAR_ACCESSORY)
 
 /datum/equipment_preset/synth/usasf // only thing that needs to be parented to something else
 	name = "Survivor - USASF Synthetic"
@@ -427,6 +416,7 @@
 
 /datum/equipment_preset/synth/usasf/load_gear(mob/living/carbon/human/preset_human)
 	preset_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy, WEAR_BODY)
+	preset_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/navy/e7, WEAR_ACCESSORY)
 	preset_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch(preset_human), WEAR_ACCESSORY)
 	preset_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/chestrig(preset_human), WEAR_BACK)
 	preset_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest(preset_human), WEAR_JACKET)