Merge pull request #14222 from Heroman3003/suit-override

Allows suit, mask and head slot items in loadout to override job items
This commit is contained in:
Casey
2022-12-23 11:23:53 -05:00
committed by GitHub
+4 -3
View File
@@ -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, "<span class='notice'>Equipping you with \the [thing]!</span>")
if(G.slot != slot_tie)
custom_equip_slots.Add(G.slot)