From 9b05856bbce9c4ab3c051b2c09154cef4c6dc299 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 23 Nov 2020 14:14:15 +0200 Subject: [PATCH] Headset Fix (#10637) --- code/datums/outfits/outfit.dm | 7 +++++-- html/changelogs/geeves-headset_fix.yml | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-headset_fix.yml diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 6bfc2830447..11d281fc2af 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -106,12 +106,12 @@ else l_ear = headset //Department headset if(l_ear) - equip_item(H, l_ear, slot_l_ear) + equip_item(H, l_ear, slot_l_ear, TRUE) return // Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del. -/datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot) +/datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/set_no_remove = FALSE) var/obj/item/I if(isnum(path)) //Check if parameter is not numeric. Must be a path, list of paths or name of a gear datum @@ -126,6 +126,9 @@ else I = new path(H) //As fallback treat it as a path + if(set_no_remove) + I.autodrobe_no_remove = TRUE + if(collect_not_del) H.equip_or_collect(I, slot) else diff --git a/html/changelogs/geeves-headset_fix.yml b/html/changelogs/geeves-headset_fix.yml new file mode 100644 index 00000000000..3a304610bde --- /dev/null +++ b/html/changelogs/geeves-headset_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Headsets no longer get put into the personal possessions box when spawning." \ No newline at end of file