From 068997f6597070cb91017f2c865bff5393db2167 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Mon, 6 Nov 2023 11:36:36 -0800 Subject: [PATCH] Fix first time load of an equipment preset assigning values vis load_status that other procs (like load_id) expected to already be set --- code/modules/gear_presets/uscm.dm | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index c35c8e1c2bf4..779bd12c0e1e 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -503,9 +503,6 @@ name = "USCM Squad Leader (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER @@ -516,6 +513,9 @@ minimap_icon = "leader" +/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/leader_equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) @@ -545,9 +545,6 @@ name = "USCM Squad Smartgunner (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN @@ -557,6 +554,9 @@ minimap_icon = "smartgunner" +/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/smartgunner_equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) @@ -582,9 +582,6 @@ name = "USCM Squad Combat Technician (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI @@ -596,6 +593,9 @@ utility_under = list(/obj/item/clothing/under/marine/engineer) +/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/engineer_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(new_human), WEAR_BODY) @@ -628,9 +628,6 @@ name = "USCM Squad Hospital Corpsman (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC @@ -642,6 +639,9 @@ utility_under = list(/obj/item/clothing/under/marine/medic) +/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/medic_equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD) @@ -682,9 +682,6 @@ name = "USCM Squad Weapons Specialist (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST @@ -694,6 +691,9 @@ minimap_icon = "spec" +/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/specialist_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -752,9 +752,6 @@ name = "USCM Fireteam Leader (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/tl_equipped/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = JOB_SQUAD_TEAM_LEADER rank = JOB_SQUAD_TEAM_LEADER @@ -764,6 +761,9 @@ minimap_icon = "tl" +/datum/equipment_preset/uscm/tl_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/tl_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels var/obj/item/clothing/under/marine/rto/U = new(new_human)