Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411

[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
parent 1b03aabf03 b861fdf56f
commit 5e2deeff84
2 changed files with 10 additions and 1 deletions
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -14,7 +14,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	return

 /mob/living/carbon/human/dummy/proc/wipe_state()
-	QDEL_LIST(contents)
+	delete_equipment()
 	cut_overlays(TRUE)

 //Inefficient pooling/caching way.
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -260,3 +260,12 @@
 		return 0

 	return O.equip(src, visualsOnly)
+
+
+//delete all equipment without dropping anything
+/mob/living/carbon/human/proc/delete_equipment()
+	for(var/slot in get_all_slots())//order matters, dependant slots go first
+		var/obj/item/I = get_item_by_slot(slot)
+		qdel(I)
+	for(var/obj/item/I in held_items)
+		qdel(I)