reshuffle

later

do later

fool

Author: Joelampost

code/__DEFINES/paygrade_defs/halo/covenant.dm code/__DEFINES/paygrade_defs/covenant.dm

@@ -1,6 +1,6 @@
 // Paygrade shorthand defines, to allow clearer designation.
 
-// USCM MARINES
+// UNSC MARINES
 /// ME1, Private
 #define PAY_SHORT_ME1 "ME1"
 

code/__DEFINES/paygrade_defs/halo/unsc.dm

@@ -6,7 +6,7 @@
 // ENLISTED MARINE PAYGRADES
 
 /datum/paygrade/unsc/marine
-	paygrade = PAY_SHORT_UNSC_ME1
+	paygrade = PAY_SHORT_ME1
 	name = "Private"
 	prefix = "PVT"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e1
@@ -15,79 +15,79 @@
 	officer_grade = GRADE_ENLISTED
 
 /datum/paygrade/unsc/marine/e2
-	paygrade = PAY_SHORT_UNSC_ME2
+	paygrade = PAY_SHORT_ME2
 	name = "Private First Class"
 	prefix = "PFC"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e2
 	ranking = 1
 	pay_multiplier = 1.7
 
 /datum/paygrade/unsc/marine/e3
-	paygrade = PAY_SHORT_UNSC_ME3
+	paygrade = PAY_SHORT_ME3
 	name = "Lance Corporal"
 	prefix = "LCpl"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e3
 	ranking = 2
 	pay_multiplier = 1.9
 
 /datum/paygrade/unsc/marine/e4
-	paygrade = PAY_SHORT_UNSC_ME4
+	paygrade = PAY_SHORT_ME4
 	name = "Corporal"
 	prefix = "Cpl"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e4
 	ranking = 3
 	pay_multiplier = 2.1
 
 /datum/paygrade/unsc/marine/e5
-	paygrade = PAY_SHORT_UNSC_ME5
+	paygrade = PAY_SHORT_ME5
 	name = "Sergeant"
 	prefix = "Sgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e5
 	ranking = 4
 	pay_multiplier = 2.2
 
 /datum/paygrade/unsc/marine/e6
-	paygrade = PAY_SHORT_UNSC_ME6
+	paygrade = PAY_SHORT_ME6
 	name = "Staff Sergeant"
 	prefix = "SSgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e6
 	ranking = 5
 	pay_multiplier = 2.4
 
 /datum/paygrade/unsc/marine/e7
-	paygrade = PAY_SHORT_UNSC_ME7
+	paygrade = PAY_SHORT_ME7
 	name = "Gunnery Sergeant"
 	prefix = "GySgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e7
 	ranking = 6
 	pay_multiplier = 2.75
 
 /datum/paygrade/unsc/marine/e8
-	paygrade = PAY_SHORT_UNSC_ME8
+	paygrade = PAY_SHORT_ME8
 	name = "Master Sergeant"
 	prefix = "MSgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e8
 	ranking = 7
 	pay_multiplier = 2.75
 
 /datum/paygrade/unsc/marine/e8e
-	paygrade = PAY_SHORT_UNSC_ME8E
+	paygrade = PAY_SHORT_ME8E
 	name = "First Sergeant"
 	prefix = "1Sgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e8e
 	ranking = 8
 	pay_multiplier = 2.75
 
 /datum/paygrade/unsc/marine/e9
-	paygrade = PAY_SHORT_UNSC_ME9
+	paygrade = PAY_SHORT_ME9
 	name = "Master Gunnery Sergeant"
 	prefix = "MGySgt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e9
 	ranking = 9
 	pay_multiplier = 3
 
 /datum/paygrade/unsc/marine/e9e
-	paygrade = PAY_SHORT_UNSC_ME9E
+	paygrade = PAY_SHORT_ME9E
 	name = "Sergeant Major"
 	prefix = "SgtMaj"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/e9e
@@ -97,7 +97,7 @@
 // COMMISSIONED MARINE PAYGRADES
 
 /datum/paygrade/unsc/o1
-	paygrade = PAY_SHORT_UNSC_MO1
+	paygrade = PAY_SHORT_MO1
 	name = "Second Lieutenant"
 	prefix = "2ndLt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o1
@@ -106,7 +106,7 @@
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/unsc/o2
-	paygrade = PAY_SHORT_UNSC_MO2
+	paygrade = PAY_SHORT_MO2
 	name = "First Lieutenant"
 	prefix = "1stLt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o2
@@ -115,7 +115,7 @@
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/marine/o3
-	paygrade = PAY_SHORT_UNSC_MO3
+	paygrade = PAY_SHORT_MO3
 	name = "Captain"
 	prefix = "Capt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o3

code/__DEFINES/paygrade_defs/marines.dm

@@ -4,36 +4,10 @@
 	faction_group = FACTION_LIST_UNSC
 	languages = list(LANGUAGE_ENGLISH)
 	idtype = /obj/item/card/id/dogtag
-	var/auto_squad_name
-	var/ert_squad = FALSE
 
 /datum/equipment_preset/unsc/load_status(mob/living/carbon/human/new_human)
 	new_human.nutrition = NUTRITION_VERYLOW
 
-/datum/equipment_preset/unsc/load_preset(mob/living/carbon/human/new_human, randomise, count_participant)
-	. = ..()
-	if(!auto_squad_name || (should_block_game_interaction(new_human) && !ert_squad))
-		return
-	if(!GLOB.data_core.manifest_modify(new_human.real_name, WEAKREF(new_human), assignment, rank))
-		GLOB.data_core.manifest_inject(new_human)
-
-	var/obj/item/card/id/ID = new_human.get_idcard()
-	var/datum/money_account/acct = create_account(new_human, rand(30, 50), GLOB.paygrades[ID.paygrade])
-	ID.associated_account_number = acct.account_number
-
-	var/datum/squad/auto_squad = get_squad_by_name(auto_squad_name)
-	if(auto_squad)
-		transfer_marine_to_squad(new_human, auto_squad, new_human.assigned_squad, ID)
-	if(!ert_squad && !auto_squad.active)
-		auto_squad.engage_squad(FALSE)
-
-	if(!auto_squad)
-		transfer_marine_to_squad(new_human, pick(GLOB.RoleAuthority.squads), new_human.assigned_squad, new_human.wear_id)
-
-	new_human.marine_buyable_categories[MARINE_CAN_BUY_EAR] = 0
-	new_human.sec_hud_set_ID()
-	new_human.hud_set_squad()
-
 ///Equipped Presets need doing///
 
 /// Marine Rifleman
@@ -43,14 +17,14 @@
 	access = list(ACCESS_MARINE_PREP)
 	assignment = JOB_UNSC_MARINE
 	rank = JOB_UNSC_MARINE
-	paygrades = list(PAY_SHORT_UNSCT_ME2 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "RFN"
 	skills = /datum/skills/pfc
 	minimap_icon = "private"
 
 /datum/equipment_preset/unsc/pfc/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSCT_ME3 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0)
 
 /// Marine Corpsman
 /datum/equipment_preset/unsc/medic
@@ -75,14 +49,14 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP)
 	assignment = JOB_UNSC_RTO
 	rank = JOB_UNSC_RTO
-	paygrades = list(PAY_SHORT_UNSC_ME4 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "RTO"
 	skills = /datum/skills/pfc
 	minimap_icon = "rto"
 
 /datum/equipment_preset/unsc/rto/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSC_ME3 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0)
 
 /// Marine Spec
 /datum/equipment_preset/unsc/spec
@@ -92,14 +66,14 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP)
 	assignment = JOB_UNSC_SPECIALIST
 	rank = JOB_UNSC_SPECIALIST
-	paygrades = list(PAY_SHORT_UNSC_ME2 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "Spc"
 	skills = /datum/skills/specialist
 	minimap_icon = "spec"
 
 /datum/equipment_preset/unsc/spec/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSC_ME3 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0)
 
 /// Fire Team Leader
 /datum/equipment_preset/unsc/tl
@@ -109,14 +83,14 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP)
 	assignment = JOB_UNSC_TEAM_LEADER
 	rank = JOB_UNSC_TEAM_LEADER
-	paygrades = list(PAY_SHORT_UNSC_ME5 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "FTL"
 	skills = /datum/skills/tl
 	minimap_icon = "tl"
 
 /datum/equipment_preset/unsc/tl/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSC_ME4 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0)
 
 /// Marine Squad Sergeant
 /datum/equipment_preset/unsc/leader
@@ -125,23 +99,23 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
 	assignment = JOB_UNSC_LEADER
 	rank = JOB_UNSC_LEADER
-	paygrades = list(PAY_SHORT_UNSC_ME7 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "SqdSgt"
 	minimum_age = 27
 	skills = /datum/skills/SL
 	minimap_icon = "leader"
 
 /datum/equipment_preset/unsc/leader/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSC_ME6 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/unsc/pc
 	name = "UNSC Platoon Commander"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
 	idtype = /obj/item/card/id/silver
 	assignment = JOB_UNSC_SO
 	rank = JOB_UNSC_SO
-	paygrades = list(PAY_SHORT_UNSC_MO2 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "PltCo"
 	minimum_age = 25
 	skills = /datum/skills/SO
@@ -171,7 +145,7 @@
 
 /datum/equipment_preset/unsc/pc/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
-	paygrades = list(PAY_SHORT_UNSC_MO1 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/unsc/pilot
 	name = "UNSC Pilot"
@@ -180,7 +154,7 @@
 	access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT)
 	assignment = JOB_UNSC_PO
 	rank = JOB_UNSC_PO
-	paygrades = list(PAY_SHORT_UNSC_MO1 = JOB_PLAYTIME_TIER_0)
+	paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "PO"
 	skills = /datum/skills/pilot
 	minimap_icon = "pilot"

code/datums/paygrades/factions/halo/unsc_ranks.dm

@@ -148,6 +148,7 @@
 #include "code\__DEFINES\paygrade_defs\army.dm"
 #include "code\__DEFINES\paygrade_defs\civilian.dm"
 #include "code\__DEFINES\paygrade_defs\cmb.dm"
+#include "code\__DEFINES\paygrade_defs\covenant.dm"
 #include "code\__DEFINES\paygrade_defs\dutch.dm"
 #include "code\__DEFINES\paygrade_defs\marines.dm"
 #include "code\__DEFINES\paygrade_defs\mercs.dm"
@@ -157,8 +158,6 @@
 #include "code\__DEFINES\paygrade_defs\twe.dm"
 #include "code\__DEFINES\paygrade_defs\upp.dm"
 #include "code\__DEFINES\paygrade_defs\weyland.dm"
-#include "code\__DEFINES\paygrade_defs\halo\covenant.dm"
-#include "code\__DEFINES\paygrade_defs\halo\unsc.dm"
 #include "code\__DEFINES\typecheck\assemblers.dm"
 #include "code\__DEFINES\typecheck\datums.dm"
 #include "code\__DEFINES\typecheck\generic_types.dm"