Merge pull request cmss13-devs#22 from Noname995/freelancer-fix

Freelancer fix

code/__DEFINES/job_ru.dm

@@ -233,12 +233,12 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //-------- PVE Mercs and PMC's  --------//
 #define SQUAD_PMCPLT "AZURE-15"
 #define SQUAD_MERC "Freelancer"
-#define JOB_RTO_FL "Radio Jockey"
-#define JOB_SQUAD_TEAM_LEADER_FL "Cutthroat"
-#define JOB_SQUAD_LEADER_FL "Master at Arms"
-#define JOB_SQUAD_SMARTGUN_FL "Gunner"
-#define JOB_SQUAD_MEDIC_FL "Surgeon"
-#define JOB_SQUAD_RIFLEMAN_FL "Merc"
+#define JOB_RTO_FL "Radio Jockey (RTO)"
+#define JOB_SQUAD_TEAM_LEADER_FL "Bruiser (FTL)"
+#define JOB_SQUAD_LEADER_FL "Warlord (PltSgt)"
+#define JOB_SQUAD_SMARTGUN_FL "Gunner (Smartgunner)"
+#define JOB_SQUAD_MEDIC_FL "Surgeon (Corpsman)"
+#define JOB_SQUAD_RIFLEMAN_FL "Merc (Rifleman)"
 #define JOB_PMCPLAT_OW "OVERWATCH"
 #define JOB_PMCPLAT_LEADER "Operations Leader"
 #define JOB_PMCPLAT_FTL "Team Leader"

code/__DEFINES/minimap.dm

@@ -65,6 +65,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_INTEL "#053818"
 #define MINIMAP_SQUAD_UPP "#B22222"
 #define MINIMAP_SQUAD_PMC "#ccffe9"
+#define MINIMAP_SQUAD_LANCER "#a5a5a5"
 
 #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
 #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"

code/__DEFINES/mode_ru.dm

@@ -143,7 +143,7 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI = list(JOB_SO, JOB_PILOT, JOB_RESERVE, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_RESERVE, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
 var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_RESERVE, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
-var/global/list/ROLES_AI_FREELANCER = list(JOB_SQUAD_RIFLEMAN_FL, JOB_SQUAD_LEADER_FL, JOB_SQUAD_MEDIC_FL, JOB_SQUAD_TEAM_LEADER_FL, JOB_SQUAD_SMARTGUN_FL, JOB_RTO_FL)
+var/global/list/ROLES_AI_FREELANCER = list(JOB_RTO_FL, JOB_SQUAD_LEADER_FL, JOB_SQUAD_TEAM_LEADER_FL, JOB_SQUAD_MEDIC_FL, JOB_SQUAD_SMARTGUN_FL, JOB_SQUAD_RIFLEMAN_FL)
 var/global/list/ROLES_PMCPLT = list(JOB_PMCPLAT_OW, JOB_PMCPLAT_LEADER, JOB_PMCPLAT_FTL, JOB_PMCPLAT_SG, JOB_PMCPLAT_STANDARD, JOB_PMCPLAT_MEDIC)
 var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.

code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm

@@ -99,12 +99,12 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
 		/datum/job/marine/smartgunner/ai/pmc = JOB_SQUAD_SMARTGUN,\
 		/datum/job/marine/leader/ai/pmc = JOB_SQUAD_LEADER,\
 		/datum/job/command/bridge/ai/pmc = JOB_PMCPLAT_OW),\
-		/datum/squad/marine/fl = list(/datum/job/marine/standard/ai/fl = JOB_SQUAD_MARINE,\
-		/datum/job/command/bridge/ai/fl = JOB_SQUAD_RTO,\
-		/datum/job/marine/leader/ai/fl = JOB_SQUAD_LEADER,\
-		/datum/job/marine/medic/ai/fl = JOB_SQUAD_MEDIC,\
-		/datum/job/marine/tl/ai/fl = JOB_SQUAD_TEAM_LEADER,\
-		/datum/job/marine/smartgunner/ai/fl = JOB_SQUAD_SMARTGUN),\
+		/datum/squad/marine/lancer = list(/datum/job/marine/standard/ai/lancer = JOB_SQUAD_MARINE,\
+		/datum/job/command/bridge/ai/lancer = JOB_SQUAD_RTO,\
+		/datum/job/marine/leader/ai/lancer = JOB_SQUAD_LEADER,\
+		/datum/job/marine/medic/ai/lancer = JOB_SQUAD_MEDIC,\
+		/datum/job/marine/tl/ai/lancer = JOB_SQUAD_TEAM_LEADER,\
+		/datum/job/marine/smartgunner/ai/lancer = JOB_SQUAD_SMARTGUN),\
 //RU-PVE ADDITION ENDS
 		/datum/squad/marine/forecon = list(/datum/job/marine/standard/ai/forecon = JOB_SQUAD_MARINE,\
 		/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,\
@@ -116,5 +116,5 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
 GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI,\
 												/datum/squad/marine/upp = ROLES_AI_UPP,\
 												/datum/squad/marine/pmc = ROLES_PMCPLT,\
-												/datum/squad/marine/fl = ROLES_AI_FREELANCER,\
+												/datum/squad/marine/lancer = ROLES_AI_FREELANCER,\
 												/datum/squad/marine/forecon = ROLES_AI_FORECON))

colonialmarines.dme

@@ -2513,6 +2513,7 @@
 #include "void-marines\code\playable_factions\areas.dm"
 #include "void-marines\code\playable_factions\fl_mod_items.dm"
 #include "void-marines\code\playable_factions\fl_presets.dm"
+#include "void-marines\code\playable_factions\lancer.dm"
 #include "void-marines\code\playable_factions\fl_vendors.dm"
 #include "void-marines\code\playable_factions\pmc_presets.dm"
 #include "void-marines\code\playable_factions\shuttles.dm"

maps/corsair.json

@@ -5,5 +5,5 @@
     "webmap_url": "GoldenArrow",
     "traits": [{"Marine Main Ship": true}],
     "nightmare_path": "maps/Nightmare/maps/corsair/",
-    "platoon": "/datum/squad/marine/fl"
+    "platoon": "/datum/squad/marine/lancer"
 }