From d3abc27673cf3ac022ea8ed642d8e17c025d704d Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 21 Dec 2022 19:46:55 +1000 Subject: [PATCH 1/2] Allows suit, mask and head slot items in loadout to override job items --- code/game/jobs/job_controller.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index f4c016785da..b3f78d01a1f 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -427,9 +427,10 @@ var/global/datum/controller/occupations/job_master // Try desperately (and sorta poorly) to equip the item. Now with increased desperation! if(G.slot && !(G.slot in custom_equip_slots)) var/metadata = H.client.prefs.gear[G.display_name] - if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) - custom_equip_leftovers += thing - else if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) + //if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) + // custom_equip_leftovers += thing\ + //else + if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) to_chat(H, "Equipping you with \the [thing]!") if(G.slot != slot_tie) custom_equip_slots.Add(G.slot) From e506d41c79976e49c554cbd37fa89dcf5448ecd1 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 21 Dec 2022 20:00:46 +1000 Subject: [PATCH 2/2] Fxies cpomment --- code/game/jobs/job_controller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index b3f78d01a1f..0f80f5c7781 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -428,7 +428,7 @@ var/global/datum/controller/occupations/job_master if(G.slot && !(G.slot in custom_equip_slots)) var/metadata = H.client.prefs.gear[G.display_name] //if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) - // custom_equip_leftovers += thing\ + // custom_equip_leftovers += thing //else if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) to_chat(H, "Equipping you with \the [thing]!")