diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 52b63ccd5f..8008c185a5 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -55,7 +55,7 @@ if(affected_mob.notransform) return affected_mob.notransform = 1 - for(var/obj/item/W in affected_mob.get_equipped_items()) + for(var/obj/item/W in affected_mob.get_equipped_items(TRUE)) affected_mob.dropItemToGround(W) for(var/obj/item/I in affected_mob.held_items) affected_mob.dropItemToGround(I) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 08fcb1baa8..8b1e104089 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -181,7 +181,7 @@ // Remove and recycle the equipped items if(eat_victim_items) - for(var/obj/item/I in L.get_equipped_items()) + for(var/obj/item/I in L.get_equipped_items(TRUE)) if(L.dropItemToGround(I)) eat(I, sound=FALSE) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2fd212b4dc..e837953f4e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -734,14 +734,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!dresscode) return + var/delete_pocket var/mob/living/carbon/human/H if(isobserver(M)) H = M.change_mob_type(/mob/living/carbon/human, null, null, TRUE) else H = M + if(alert("Drop Items in Pockets? No will delete them.", "Robust quick dress shop", "Yes", "No") == "No") + delete_pocket = TRUE SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - for (var/obj/item/I in H.get_equipped_items()) + for (var/obj/item/I in H.get_equipped_items(delete_pocket)) qdel(I) if(dresscode != "Naked") H.equipOutfit(dresscode) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index fd9de5308b..410e976b85 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -290,7 +290,7 @@ /datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag) - for(var/I in mannequin.get_equipped_items()) + for(var/I in mannequin.get_equipped_items(TRUE)) qdel(I) if (ispath(antag, /datum/antagonist/ert)) var/datum/antagonist/ert/ert = antag diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm index 6f50e69c84..4e511d7fac 100644 --- a/code/modules/antagonists/highlander/highlander.dm +++ b/code/modules/antagonists/highlander/highlander.dm @@ -42,7 +42,7 @@ if(!istype(H)) return - for(var/obj/item/I in H.get_equipped_items()) + for(var/obj/item/I in H.get_equipped_items(TRUE)) qdel(I) for(var/obj/item/I in H.held_items) qdel(I) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 25a0e804a4..9e3ffaf483 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -117,7 +117,7 @@ if(isigniter(assembly.a_left) == isigniter(assembly.a_right)) return - if((src in user.get_equipped_items()) && !user.canUnEquip(src)) + if((src in user.get_equipped_items(TRUE)) && !user.canUnEquip(src)) to_chat(user, "[src] is stuck to you!") return diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6375f7986f..88752f7415 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -151,7 +151,7 @@ r_hand = /obj/item/twohanded/fireaxe /datum/outfit/psycho/post_equip(mob/living/carbon/human/H) - for(var/obj/item/carried_item in H.get_equipped_items()) + for(var/obj/item/carried_item in H.get_equipped_items(TRUE)) carried_item.add_mob_blood(H)//Oh yes, there will be blood... for(var/obj/item/I in H.held_items) I.add_mob_blood(H) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 4e945b437f..44af3936a8 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -379,7 +379,7 @@ /mob/living/proc/unequip_everything() var/list/items = list() - items |= get_equipped_items() + items |= get_equipped_items(TRUE) for(var/I in items) dropItemToGround(I) drop_all_held_items() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 45aa3b06ff..f1940be0e2 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -23,7 +23,7 @@ CH.cavity_item = null if(tr_flags & TR_KEEPITEMS) - var/Itemlist = get_equipped_items() + var/Itemlist = get_equipped_items(TRUE) Itemlist += held_items for(var/obj/item/W in Itemlist) dropItemToGround(W) @@ -174,7 +174,7 @@ //now the rest if (tr_flags & TR_KEEPITEMS) - var/Itemlist = get_equipped_items() + var/Itemlist = get_equipped_items(TRUE) Itemlist += held_items for(var/obj/item/W in Itemlist) dropItemToGround(W, TRUE) @@ -495,7 +495,7 @@ SSblackbox.record_feedback("amount", "gorillas_created", 1) - var/Itemlist = get_equipped_items() + var/Itemlist = get_equipped_items(TRUE) Itemlist += held_items for(var/obj/item/W in Itemlist) dropItemToGround(W, TRUE)