diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 308898fc8ca..b1e6625d739 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -425,7 +425,7 @@ var/list/global/slot_flags_enumeration = list( return 0 //Next check that the slot is free - if(H.get_equipped_item(slot)) + if(H.get_equipped_item(slot) && !bypass_blocked_check) return 0 //Next check if the slot is accessible. diff --git a/code/modules/mob/abstract/new_player/preferences_setup.dm b/code/modules/mob/abstract/new_player/preferences_setup.dm index 90b2b844a7e..6dbd76c97d3 100644 --- a/code/modules/mob/abstract/new_player/preferences_setup.dm +++ b/code/modules/mob/abstract/new_player/preferences_setup.dm @@ -211,12 +211,12 @@ var/list/leftovers = list() var/list/used_slots = list() - if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && !(previewJob && (equip_preview_mob & EQUIP_PREVIEW_JOB) && (previewJob.type == /datum/job/ai || previewJob.type == /datum/job/cyborg))) - SSjobs.EquipCustom(mannequin, previewJob, src, leftovers, null, used_slots) - if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob) previewJob.equip_preview(mannequin, player_alt_titles[previewJob.title], faction) + if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && !(previewJob && (equip_preview_mob & EQUIP_PREVIEW_JOB) && (previewJob.type == /datum/job/ai || previewJob.type == /datum/job/cyborg))) + SSjobs.EquipCustom(mannequin, previewJob, src, leftovers, null, used_slots) + if(equip_preview_mob & EQUIP_PREVIEW_LOADOUT && leftovers.len) SSjobs.EquipCustomDeferred(mannequin, src, leftovers, used_slots) diff --git a/html/changelogs/mattatlas-blockcheck.yml b/html/changelogs/mattatlas-blockcheck.yml new file mode 100644 index 00000000000..c206b72d384 --- /dev/null +++ b/html/changelogs/mattatlas-blockcheck.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The loadout will now substitute job clothing in the preview."