cmbfixesFORREAL

cmss13-devs · Sep 24, 2023 · 3ef9e30 · 3ef9e30
1 parent 4e704b0
commit 3ef9e30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm
@@ -113,7 +113,7 @@
 /datum/emergency_call/cmb/anchorpoint/New()
 	..()
 	arrival_message = "[MAIN_SHIP_NAME], this is Anchorpoint Station. Be advised, a QRF Team of our Colonial Marines is currently attempting to board you. Open your ports, transmitting docking codes now. Standby."
-	objectives = "QRF Team. You are here to reinforce the cmb team we deployed earlier. Make contact and work with the CMB Marshal and their deputies. Facilitate their protection and evacuation if necessary. Secondary Objective: Investigate the reason for distress aboard the [MAIN_SHIP_NAME], and assist the crew if possible."
+	objectives = "QRF Team. You are here to reinforce the CMB team we deployed earlier. Make contact and work with the CMB Marshal and their deputies. Facilitate their protection and evacuation if necessary. Secondary Objective: Investigate the reason for distress aboard the [MAIN_SHIP_NAME], and assist the crew if possible."
 
 /datum/emergency_call/cmb/anchorpoint/create_member(datum/mind/M, turf/override_spawn_loc)
 	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()

diff --git a/code/game/jobs/job/special/cmb.dm b/code/game/jobs/job/special/cmb.dm
@@ -6,6 +6,11 @@
 /datum/job/special/cmb/marshal
 	title = JOB_CMB_TL
 
+AddTimelock(/datum/job/special/cmb/marshal, list(
+	JOB_SQUAD_LEADER = 5 HOURS,
+))
+
+
 // CMB Investigative Synthetic
 /datum/job/special/cmb/synthetic
 	title = JOB_CMB_SYN
@@ -14,6 +19,10 @@
 /datum/job/special/cmb/icc_liaison
 	title = JOB_CMB_ICC
 
+AddTimelock(/datum/job/special/cmb/icc_liaison, list(
+	JOB_CORPORATE_LIAISON = 1 HOURS,
+))
+
 // Interstellar Human Rights Observer
 /datum/job/special/cmb/observer
 	title = JOB_CMB_OBS
diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
@@ -416,12 +416,6 @@
 	. = ..()
 	new_human.nutrition = rand(NUTRITION_MAX, NUTRITION_NORMAL)
 
-/datum/equipment_preset/uscm/cmb/load_rank(mob/living/carbon/human/new_human)
-	if(new_human.client)
-		if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1)
-			return "ME1"
-	return paygrade
-
 /datum/equipment_preset/uscm/cmb/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)