Merge branch 'campaign' of https://github.com/VoiceInYourHead/PvE-CMSS13

 into campaign

colonialmarines.dme

@@ -2519,4 +2519,5 @@
 #include "void-marines\code\playable_factions\pmc_presets.dm"
 #include "void-marines\code\playable_factions\shuttles.dm"
 #include "void-marines\code\playable_factions\stuff.dm"
+#include "void-marines\code\playable_factions\faction_paygrades\freelancer.dm"
 // END_INCLUDE

void-marines/code/playable_factions/faction_paygrades/freelancer.dm

@@ -0,0 +1,5 @@
+/datum/paygrade/lancer/basic
+	paygrade = "Freelancer"
+	name = "Freelancer"
+	prefix = "Freelancer"
+	pay_multiplier = 1.1

void-marines/code/playable_factions/fl_presets.dm

@@ -1,6 +1,6 @@
 /datum/equipment_preset/uscm/lancer
 	name = "Freelancer Marauder"
-	paygrade = "Freelancer Marauder"
+	paygrade = "Freelancer"
 	role_comm_title = "FL"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP)
 	faction_group = list(FACTION_FREELANCER)
@@ -20,9 +20,11 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
+	new_human.hud_set_squad()
+
 /datum/equipment_preset/uscm/lancer/smartgunner
 	name = "Freelancer Machinegunner"
-	paygrade = "Freelancer Gunner"
+	paygrade = "Freelancer"
 	role_comm_title = "MG"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SMARTGUNNER)
 	assignment = "Machinegunner"
@@ -41,7 +43,7 @@
 
 /datum/equipment_preset/uscm/lancer/rto
 	name = "Radio Jockey"
-	paygrade = "Freelancer Jokey"
+	paygrade = "Freelancer"
 	role_comm_title = "RJ"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_CO)
 	assignment = "Radio Jokey"
@@ -60,7 +62,7 @@
 
 /datum/equipment_preset/uscm/lancer/med
 	name = "Freelancer Surgeon"
-	paygrade = "Freelancer Medic"
+	paygrade = "Freelancer"
 	role_comm_title = "Srg"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_MEDICAL)
 	assignment = "Surgeon"
@@ -71,15 +73,15 @@
 /datum/equipment_preset/uscm/lancer/med/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/marine/medic/upp
+		back_item = /obj/item/storage/backpack/marine/medic
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
 /datum/equipment_preset/uscm/lancer/tl
 	name = "Freelancer Bruiser"
-	paygrade = "Freelancer Standard"
+	paygrade = "Freelancer"
 	role_comm_title = "Bruiser"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_TEAMLEAD)
 	assignment = "Bruiser"
@@ -98,7 +100,7 @@
 
 /datum/equipment_preset/uscm/lancer/sl
 	name = "Freelancer Warlord"
-	paygrade = "Freelancer Leader"
+	paygrade = "Freelancer"
 	role_comm_title = "Warlord"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SENIOR_LEAD)
 	assignment = "Warlord"

void-marines/code/playable_factions/lancer.dm

@@ -22,7 +22,7 @@
 		if(JOB_SQUAD_MEDIC)
 			hud_icon_state = "med"
 	if(hud_icon_state)
-		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "pmc_[hud_icon_state]")
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[hud_icon_state]")
 
 	var/datum/squad/squad = H.assigned_squad
 	if(istype(squad, /datum/squad/marine/lancer))