Merge pull request #576 from KasparoVy/overenswaggered

Fixes Only One Accessory Equipped at Spawn & in Character Preview
This commit is contained in:
Razgriz
2020-10-12 23:01:24 -07:00
committed by GitHub
2 changed files with 7 additions and 5 deletions
@@ -220,7 +220,7 @@
break
if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && !(previewJob && (equip_preview_mob & EQUIP_PREVIEW_JOB) && (previewJob.type == /datum/job/ai || previewJob.type == /datum/job/cyborg)))
var/list/equipped_slots = list() //If more than one item takes the same slot only spawn the first
var/list/equipped_slots = list()
for(var/thing in gear)
var/datum/gear/G = gear_datums[thing]
if(G)
@@ -243,7 +243,8 @@
if(G.slot && !(G.slot in equipped_slots))
var/metadata = gear[G.display_name]
if(mannequin.equip_to_slot_or_del(G.spawn_item(mannequin, metadata), G.slot))
equipped_slots += G.slot
if(G.slot != slot_tie)
equipped_slots += G.slot
if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob)
mannequin.job = previewJob.title