From 0436afea65730c1bd0aa9d9ef0e3b45d1ddea433 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 6 Jan 2025 21:14:40 +0100
Subject: [PATCH 1/5] some dropped sanity

---
 code/game/gamemodes/changeling/powers/armor.dm        | 8 +++++---
 code/game/gamemodes/technomancer/spell_objs.dm        | 2 +-
 code/game/machinery/pipe/construction.dm              | 4 ++--
 code/game/objects/items.dm                            | 1 +
 code/game/objects/items/devices/chameleonproj.dm      | 2 +-
 code/game/objects/items/devices/gps.dm                | 2 +-
 code/game/objects/items/weapons/chewables.dm          | 2 +-
 code/game/objects/items/weapons/handcuffs.dm          | 2 +-
 code/game/objects/items/weapons/material/twohanded.dm | 2 +-
 code/game/objects/items/weapons/melee/energy.dm       | 2 +-
 code/game/objects/items/weapons/melee/shock_maul.dm   | 2 +-
 code/game/objects/items/weapons/mop_deploy.dm         | 2 +-
 code/game/objects/items/weapons/stunbaton.dm          | 2 +-
 code/game/objects/items/weapons/weaponry.dm           | 2 +-
 code/modules/artifice/deadringer.dm                   | 2 +-
 code/modules/artifice/telecube.dm                     | 2 +-
 code/modules/assembly/proximity.dm                    | 2 +-
 code/modules/awaymissions/redgate.dm                  | 4 ++--
 code/modules/clothing/accessories/accessory_vr.dm     | 4 ++--
 code/modules/clothing/accessories/clothing.dm         | 2 +-
 code/modules/clothing/clothing.dm                     | 2 +-
 code/modules/clothing/glasses/hud_vr.dm               | 2 +-
 code/modules/clothing/gloves/gauntlets.dm             | 4 ++--
 code/modules/clothing/head/soft_caps.dm               | 2 +-
 code/modules/clothing/masks/monitor.dm                | 2 +-
 code/modules/clothing/masks/tesh_synth_facemask.dm    | 2 +-
 code/modules/clothing/shoes/magboots.dm               | 4 ++--
 code/modules/clothing/spacesuits/spacesuits.dm        | 2 +-
 code/modules/clothing/spacesuits/void/void.dm         | 2 +-
 code/modules/clothing/suits/hooded.dm                 | 2 +-
 code/modules/mob/mob_grab.dm                          | 2 +-
 code/modules/vore/fluffstuff/custom_clothes_vr.dm     | 2 +-
 code/modules/vore/fluffstuff/custom_items_vr.dm       | 2 +-
 33 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm
index 55b55ada488..d1c39338b92 100644
--- a/code/game/gamemodes/changeling/powers/armor.dm
+++ b/code/game/gamemodes/changeling/powers/armor.dm
@@ -48,7 +48,8 @@
 		span_warning("We inflate our flesh, creating a spaceproof suit!"),
 		span_warningplain("You hear organic matter ripping and tearing!"))
 
-/obj/item/clothing/suit/space/changeling/dropped()
+/obj/item/clothing/suit/space/changeling/dropped(mob/user)
+	..()
 	qdel(src)
 
 /obj/item/clothing/head/helmet/space/changeling
@@ -60,7 +61,8 @@
 	body_parts_covered = HEAD|FACE|EYES
 	canremove = FALSE
 
-/obj/item/clothing/head/helmet/space/changeling/dropped()
+/obj/item/clothing/head/helmet/space/changeling/dropped(mob/user)
+	..()
 	qdel(src)
 
 /obj/item/clothing/shoes/magboots/changeling
@@ -89,7 +91,7 @@
 		force = 5
 		to_chat(user, "We cling to the terrain below us.")
 
-/obj/item/clothing/shoes/magboots/changeling/dropped()
+/obj/item/clothing/shoes/magboots/changeling/dropped(mob/user)
 	..()
 	qdel(src)
 
diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm
index 27e8f168437..e869e8b876a 100644
--- a/code/game/gamemodes/technomancer/spell_objs.dm
+++ b/code/game/gamemodes/technomancer/spell_objs.dm
@@ -282,7 +282,7 @@
 // Proc: dropped()
 // Parameters: 0
 // Description: Deletes the spell object immediately.
-/obj/item/spell/dropped()
+/obj/item/spell/dropped(mob/user)
 	spawn(1)
 		if(src)
 			qdel(src)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 47c9f11e628..1f4db6607f4 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -65,7 +65,7 @@ Buildable meters
 	if(make_from.mirrored)
 		do_a_flip()
 
-/obj/item/pipe/dropped()
+/obj/item/pipe/dropped(mob/user)
 	if(loc)
 		setPipingLayer(piping_layer)
 	return ..()
@@ -286,7 +286,7 @@ Buildable meters
 	to_chat(user, span_notice("You fasten the meter to the pipe."))
 	qdel(src)
 
-/obj/item/pipe_meter/dropped()
+/obj/item/pipe_meter/dropped(mob/user)
 	. = ..()
 	if(loc)
 		setAttachLayer(piping_layer)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a8d526c31a9..3ead10fe5da 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -379,6 +379,7 @@
 
 // apparently called whenever an item is removed from a slot, container, or anything else.
 /obj/item/proc/dropped(mob/user as mob)
+	SHOULD_CALL_PARENT(TRUE)
 	if(zoom)
 		zoom() //binoculars, scope, etc
 	appearance_flags &= ~NO_CLIENT_COLOR
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index e85308b5dda..ae3b767bc64 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -19,7 +19,7 @@
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
 
-/obj/item/chameleon/dropped()
+/obj/item/chameleon/dropped(mob/user)
 	disrupt()
 	..()
 
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 98993800d79..578279ae0a6 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	. = ..()
 	update_holder()
 
-/obj/item/gps/dropped()
+/obj/item/gps/dropped(mob/user)
 	. = ..()
 	update_holder()
 
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index fa69ce9b4a1..8cfb04aa8fe 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -43,7 +43,7 @@
 		else
 			to_chat(user, span_notice("You don't have a mouth, and can't make much use of \the [src]."))
 
-/obj/item/clothing/mask/chewable/dropped()
+/obj/item/clothing/mask/chewable/dropped(mob/user)
 	STOP_PROCESSING(SSprocessing, src)
 	..()
 
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 92c8683e5c3..42fe4ae1ab4 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -301,7 +301,7 @@ var/last_chew = 0
 	if(user) //A ranged legcuff, until proper implementation as items it remains a projectile-only thing.
 		return 1
 
-/obj/item/handcuffs/legcuffs/bola/dropped()
+/obj/item/handcuffs/legcuffs/bola/dropped(mob/user)
 	visible_message(span_infoplain(span_bold("\The [src]") + " falls apart!"))
 	qdel(src)
 
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 3490468795b..ba344cedaea 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -72,7 +72,7 @@
 	icon_state = "[base_icon][wielded]"
 	item_state = icon_state
 
-/obj/item/material/twohanded/dropped()
+/obj/item/material/twohanded/dropped(mob/user)
 	..()
 	if(wielded)
 		spawn(0)
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 96b96712d07..b56b6f37c32 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -453,7 +453,7 @@
 	user.drop_from_inventory(src)
 	spawn(1) if(src) qdel(src)
 
-/obj/item/melee/energy/blade/dropped()
+/obj/item/melee/energy/blade/dropped(mob/user)
 	spawn(1) if(src) qdel(src)
 
 /obj/item/melee/energy/blade/process()
diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm
index b5df24d40c8..74413851c5f 100644
--- a/code/game/objects/items/weapons/melee/shock_maul.dm
+++ b/code/game/objects/items/weapons/melee/shock_maul.dm
@@ -146,7 +146,7 @@
 	else
 		set_light(0)
 
-/obj/item/melee/shock_maul/dropped()
+/obj/item/melee/shock_maul/dropped(mob/user)
 	..()
 	if(status)
 		status = 0
diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm
index 9b63216af2b..2498240660c 100644
--- a/code/game/objects/items/weapons/mop_deploy.dm
+++ b/code/game/objects/items/weapons/mop_deploy.dm
@@ -56,7 +56,7 @@
 	user.drop_from_inventory(src)
 	spawn(1) if(!QDELETED(src)) qdel(src)
 
-/obj/item/mop_deploy/dropped()
+/obj/item/mop_deploy/dropped(mob/user)
 	spawn(1) if(!QDELETED(src)) qdel(src)
 
 /obj/item/mop_deploy/process()
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index eedb93e1809..a03c72af748 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -99,7 +99,7 @@
 	else
 		set_light(0)
 
-/obj/item/melee/baton/dropped()
+/obj/item/melee/baton/dropped(mob/user)
 	..()
 	if(status && grip_safety && !taped_safety)
 		status = 0
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 0e01e58c39b..79fe9ff8d1c 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -59,7 +59,7 @@
 	force = 0
 	var/net_type = /obj/effect/energy_net
 
-/obj/item/energy_net/dropped()
+/obj/item/energy_net/dropped(mob/user)
 	spawn(10)
 		if(src) qdel(src)
 
diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm
index fb1f60b7ecc..cebd607fa40 100644
--- a/code/modules/artifice/deadringer.dm
+++ b/code/modules/artifice/deadringer.dm
@@ -23,7 +23,7 @@
 	STOP_PROCESSING(SSobj, src)
 	..()
 
-/obj/item/deadringer/dropped()
+/obj/item/deadringer/dropped(mob/user)
 	if(timer > 20)
 		reveal()
 		watchowner = null
diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm
index 112625a2b9c..a4be0167317 100644
--- a/code/modules/artifice/telecube.dm
+++ b/code/modules/artifice/telecube.dm
@@ -114,7 +114,7 @@
 	. = ..()
 	update_icon()
 
-/obj/item/telecube/dropped()
+/obj/item/telecube/dropped(mob/user)
 	. = ..()
 	update_icon()
 
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 42c156e9634..b445938eb35 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -63,7 +63,7 @@
 		toggle_scan()
 		time = initial(time)
 
-/obj/item/assembly/prox_sensor/dropped()
+/obj/item/assembly/prox_sensor/dropped(mob/user)
 	sense()
 
 /obj/item/assembly/prox_sensor/proc/toggle_scan()
diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm
index c43d695864c..33aa3f40d80 100644
--- a/code/modules/awaymissions/redgate.dm
+++ b/code/modules/awaymissions/redgate.dm
@@ -1489,7 +1489,7 @@
 
 /*
 //TODO - make this not trigger when the flag is returned to its original location
-/obj/item/laserdome_flag/dropped()
+/obj/item/laserdome_flag/dropped(mob/user)
 	. = ..()
 	global_announcer.autosay("[src] dropped!","Laserdome Announcer","Entertainment")
 */
@@ -1654,7 +1654,7 @@
 
 /*
 //TODO- make this not trigger when the ball is thrown or dunked, only when it's actually dropped
-/obj/item/laserdome_hyperball/dropped()
+/obj/item/laserdome_hyperball/dropped(mob/user)
 	. = ..()
 	global_announcer.autosay("[capitalize(last_team)] fumble!","Laserdome Announcer","Entertainment")
 */
diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm
index 3ede4d67a7a..10937273306 100644
--- a/code/modules/clothing/accessories/accessory_vr.dm
+++ b/code/modules/clothing/accessories/accessory_vr.dm
@@ -41,7 +41,7 @@
 	setUniqueSpeciesSprite()
 	..(S, user)
 
-/obj/item/clothing/accessory/choker/dropped()
+/obj/item/clothing/accessory/choker/dropped(mob/user)
 	icon_override = icon_previous_override
 
 /obj/item/clothing/accessory/collar
@@ -79,7 +79,7 @@
 	setUniqueSpeciesSprite()
 	..(S, user)
 
-/obj/item/clothing/accessory/collar/dropped()
+/obj/item/clothing/accessory/collar/dropped(mob/user)
 	icon_override = icon_previous_override
 
 /obj/item/clothing/accessory/collar/silver
diff --git a/code/modules/clothing/accessories/clothing.dm b/code/modules/clothing/accessories/clothing.dm
index aac2b495ec6..5b9aae59da5 100644
--- a/code/modules/clothing/accessories/clothing.dm
+++ b/code/modules/clothing/accessories/clothing.dm
@@ -187,7 +187,7 @@
 			icon_override = 'icons/inventory/accessory/mob.dmi'
 		update_clothing_icon()
 
-/obj/item/clothing/accessory/poncho/dropped() //Resets the override to prevent the wrong .dmi from being used because equipped only triggers when wearing ponchos as suits.
+/obj/item/clothing/accessory/poncho/dropped(mob/user) //Resets the override to prevent the wrong .dmi from being used because equipped only triggers when wearing ponchos as suits.
 	icon_override = null
 
 /obj/item/clothing/accessory/poncho/green
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 4aaf9036ba9..49fde57ce59 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -406,7 +406,7 @@
 	wearer = H //TODO clean this when magboots are cleaned
 	return 1
 
-/obj/item/clothing/gloves/dropped()
+/obj/item/clothing/gloves/dropped(mob/user)
 	..()
 
 	if(!wearer)
diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm
index adfed8dc0ef..c14a2ed45ea 100644
--- a/code/modules/clothing/glasses/hud_vr.dm
+++ b/code/modules/clothing/glasses/hud_vr.dm
@@ -25,7 +25,7 @@
 	QDEL_NULL(tgarscreen)
 	. = ..()
 
-/obj/item/clothing/glasses/omnihud/dropped()
+/obj/item/clothing/glasses/omnihud/dropped(mob/user)
 	if(tgarscreen)
 		SStgui.close_uis(src)
 	..()
diff --git a/code/modules/clothing/gloves/gauntlets.dm b/code/modules/clothing/gloves/gauntlets.dm
index efb25587a92..0a27fbb0cb7 100644
--- a/code/modules/clothing/gloves/gauntlets.dm
+++ b/code/modules/clothing/gloves/gauntlets.dm
@@ -39,7 +39,7 @@
 	wearer = H
 	return 1
 
-/obj/item/clothing/gloves/gauntlets/dropped()
+/obj/item/clothing/gloves/gauntlets/dropped(mob/user)
 	var/mob/living/carbon/human/H = wearer
 	if(gloves)
 		if(!H.equip_to_slot_if_possible(gloves, slot_gloves))
@@ -47,4 +47,4 @@
 		if(ring)
 			gloves.ring = ring
 		src.gloves = null
-	wearer = null
\ No newline at end of file
+	wearer = null
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 1d1742bca9d..71ed3f64ca5 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -7,7 +7,7 @@
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 
-/obj/item/clothing/head/soft/dropped()
+/obj/item/clothing/head/soft/dropped(mob/user)
 	icon_state = initial(icon_state)
 	flipped=0
 	..()
diff --git a/code/modules/clothing/masks/monitor.dm b/code/modules/clothing/masks/monitor.dm
index 5efb8fb6d51..1e2b681a39e 100644
--- a/code/modules/clothing/masks/monitor.dm
+++ b/code/modules/clothing/masks/monitor.dm
@@ -29,7 +29,7 @@
 			icon_state = monitor_states[monitor_state_index]
 			to_chat(H, span_notice("\The [src] connects to your display output."))
 
-/obj/item/clothing/mask/monitor/dropped()
+/obj/item/clothing/mask/monitor/dropped(mob/user)
 	canremove = TRUE
 	return ..()
 
diff --git a/code/modules/clothing/masks/tesh_synth_facemask.dm b/code/modules/clothing/masks/tesh_synth_facemask.dm
index e63002f3cca..1bead921c86 100644
--- a/code/modules/clothing/masks/tesh_synth_facemask.dm
+++ b/code/modules/clothing/masks/tesh_synth_facemask.dm
@@ -21,7 +21,7 @@
 		maskmaster = H
 		START_PROCESSING(SSprocessing, src)
 
-/obj/item/clothing/mask/synthfacemask/dropped()
+/obj/item/clothing/mask/synthfacemask/dropped(mob/user)
 	canremove = 1
 	maskmaster = null
 	STOP_PROCESSING(SSprocessing, src)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 756d7f4d3f9..d58de1f1628 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -69,7 +69,7 @@
 	wearer = H
 	return 1
 
-/obj/item/clothing/shoes/magboots/dropped()
+/obj/item/clothing/shoes/magboots/dropped(mob/user)
 	..()
 	var/mob/living/carbon/human/H = wearer
 	if(shoes)
@@ -115,7 +115,7 @@
 
 //In case they somehow come off while enabled.
 /obj/item/clothing/shoes/magboots/vox/dropped(mob/user as mob)
-	..()
+	..(user)
 	if(src.magpulse)
 		user.visible_message("The [src] go limp as they are removed from [usr]'s feet.", "The [src] go limp as they are removed from your feet.")
 		item_flags &= ~NOSLIP
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index b70ddc6a571..d4bdfc61881 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -101,7 +101,7 @@
 	check_limb_support(M)
 	..()
 
-/obj/item/clothing/suit/space/dropped(var/mob/user)
+/obj/item/clothing/suit/space/dropped(mob/user)
 	check_limb_support(user)
 	..()
 
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 5402905a237..143de9b9c50 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -111,7 +111,7 @@
 			to_chat(M, "Your suit's cooling unit deploys.")
 			cooler.canremove = FALSE
 
-/obj/item/clothing/suit/space/void/dropped()
+/obj/item/clothing/suit/space/void/dropped(mob/user)
 	..()
 
 	var/mob/living/carbon/human/H
diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm
index 9efe8ab4940..566d9c65e2e 100644
--- a/code/modules/clothing/suits/hooded.dm
+++ b/code/modules/clothing/suits/hooded.dm
@@ -42,7 +42,7 @@
 			H.update_inv_wear_suit()
 		hood.forceMove(src)
 
-/obj/item/clothing/suit/storage/hooded/dropped()
+/obj/item/clothing/suit/storage/hooded/dropped(mob/user)
 	RemoveHood()
 	..()
 
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 70b99d2ad0d..499d7089b5c 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -347,7 +347,7 @@
 	if(M == assailant && state >= GRAB_AGGRESSIVE)
 		devour(affecting, assailant)
 
-/obj/item/grab/dropped()
+/obj/item/grab/dropped(mob/user)
 	loc = null
 	if(!QDELETED(src))
 		qdel(src)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 3557aefd065..a43bab5c77c 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2283,7 +2283,7 @@ Departamental Swimsuits, for general use
 		icon_override = 'icons/vore/custom_onmob_vr.dmi'
 	update_clothing_icon()
 
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped()
+/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped(mob/user)
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
 
 /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user)
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index eca1456e88f..2ea513bad20 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -962,7 +962,7 @@
 	else
 		set_light(0)
 
-/obj/item/melee/baton/fluff/stunstaff/dropped()
+/obj/item/melee/baton/fluff/stunstaff/dropped(mob/user)
 	..()
 	if(wielded)
 		wielded = 0

From d9fc7dac707287c8b3e55ce23339f9b813e44207 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 6 Jan 2025 21:25:36 +0100
Subject: [PATCH 2/5] should call parent

---
 code/_onclick/telekinesis.dm                               | 1 +
 code/game/gamemodes/changeling/powers/armblade.dm          | 1 +
 code/game/gamemodes/changeling/powers/bioelectrogenesis.dm | 1 +
 code/game/gamemodes/changeling/powers/electric_lockpick.dm | 1 +
 code/game/gamemodes/technomancer/spell_objs.dm             | 1 +
 code/game/objects/items/devices/t_scanner.dm               | 1 +
 code/game/objects/items/weapons/melee/energy.dm            | 1 +
 code/game/objects/items/weapons/mop_deploy.dm              | 1 +
 code/game/objects/items/weapons/storage/laundry_basket.dm  | 1 +
 code/game/objects/items/weapons/storage/storage.dm         | 2 +-
 code/game/objects/items/weapons/trays.dm                   | 1 +
 code/game/objects/items/weapons/weaponry.dm                | 1 +
 code/modules/artifice/deadringer.dm                        | 1 +
 code/modules/assembly/proximity.dm                         | 1 +
 code/modules/clothing/accessories/accessory_vr.dm          | 2 ++
 code/modules/clothing/accessories/clothing.dm              | 1 +
 code/modules/clothing/gloves/gauntlets.dm                  | 1 +
 code/modules/games/cards.dm                                | 1 +
 code/modules/holomap/mapper.dm                             | 1 +
 code/modules/mining/kinetic_crusher.dm                     | 1 +
 code/modules/mob/mob_grab.dm                               | 1 +
 code/modules/vore/fluffstuff/custom_clothes_vr.dm          | 1 +
 code/modules/vore/resizing/holder_vr.dm                    | 1 +
 23 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index efe047ebeff..8785a479802 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -75,6 +75,7 @@ var/const/tk_maxrange = 15
 	var/mob/living/host = null
 
 /obj/item/tk_grab/dropped(mob/user as mob)
+	..()
 	if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item
 		if(focus.Adjacent(loc))
 			focus.loc = loc
diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm
index 650b134800d..6b49e7fed2a 100644
--- a/code/game/gamemodes/changeling/powers/armblade.dm
+++ b/code/game/gamemodes/changeling/powers/armblade.dm
@@ -75,6 +75,7 @@
 		src.creator = loc
 
 /obj/item/melee/changeling/dropped(mob/user)
+	..()
 	visible_message(span_warning("With a sickening crunch, [creator] reforms their arm!"),
 	span_notice("We assimilate the weapon back into our body."),
 	span_warningplain("You hear organic matter ripping and tearing!"))
diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
index cb1938fc1ce..cce2d1da01e 100644
--- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
+++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
@@ -122,6 +122,7 @@
 		new /obj/effect/effect/sparks(T)
 
 /obj/item/electric_hand/dropped(mob/user)
+	..()
 	spawn(1)
 		if(src)
 			qdel(src)
diff --git a/code/game/gamemodes/changeling/powers/electric_lockpick.dm b/code/game/gamemodes/changeling/powers/electric_lockpick.dm
index 3b4edc576f7..59ed913073f 100644
--- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm
+++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm
@@ -37,6 +37,7 @@
 		to_chat(loc, span_notice("We shape our finger to fit inside electronics, and are ready to force them open."))
 
 /obj/item/finger_lockpick/dropped(mob/user)
+	..()
 	to_chat(user, span_notice("We discreetly shape our finger back to a less suspicious form."))
 	spawn(1)
 		if(src)
diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm
index e869e8b876a..a18db491708 100644
--- a/code/game/gamemodes/technomancer/spell_objs.dm
+++ b/code/game/gamemodes/technomancer/spell_objs.dm
@@ -283,6 +283,7 @@
 // Parameters: 0
 // Description: Deletes the spell object immediately.
 /obj/item/spell/dropped(mob/user)
+	..()
 	spawn(1)
 		if(src)
 			qdel(src)
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 50fff1fdd6b..a16f8491c31 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -135,6 +135,7 @@
 
 /obj/item/t_scanner/dropped(mob/user)
 	set_user_client(null)
+	..()
 
 /obj/item/t_scanner/upgraded
 	name = "Upgraded T-ray Scanner"
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index b56b6f37c32..c0f032ced7c 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -454,6 +454,7 @@
 	spawn(1) if(src) qdel(src)
 
 /obj/item/melee/energy/blade/dropped(mob/user)
+	..()
 	spawn(1) if(src) qdel(src)
 
 /obj/item/melee/energy/blade/process()
diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm
index 2498240660c..2b2a9130f80 100644
--- a/code/game/objects/items/weapons/mop_deploy.dm
+++ b/code/game/objects/items/weapons/mop_deploy.dm
@@ -57,6 +57,7 @@
 	spawn(1) if(!QDELETED(src)) qdel(src)
 
 /obj/item/mop_deploy/dropped(mob/user)
+	..()
 	spawn(1) if(!QDELETED(src)) qdel(src)
 
 /obj/item/mop_deploy/process()
diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm
index 17d20f0456a..30a74c04b23 100644
--- a/code/game/objects/items/weapons/storage/laundry_basket.dm
+++ b/code/game/objects/items/weapons/storage/laundry_basket.dm
@@ -83,6 +83,7 @@
 	use_to_pickup = FALSE
 
 /obj/item/storage/laundry_basket/offhand/dropped(mob/user as mob)
+	SHOULD_CALL_PARENT(FALSE)
 	if(user.isEquipped(linked))
 		user.drop_from_inventory(linked)
 	return
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 5e24ac1da46..1e541394b89 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -605,7 +605,7 @@
 	return handle_item_insertion(W)
 
 /obj/item/storage/dropped(mob/user as mob)
-	return
+	return ..()
 
 /obj/item/storage/attack_hand(mob/user as mob)
 	if(ishuman(user) && !pocketable)
diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm
index 1149d2f3ec9..fdf512b2998 100644
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -196,6 +196,7 @@
 			add_overlay(Img)
 
 /obj/item/tray/dropped(mob/user)
+	..()
 	var/noTable = null
 
 	spawn() //Allows the tray to udpate location, rather than just checking against mob's location
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 79fe9ff8d1c..568c5aebd16 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -60,6 +60,7 @@
 	var/net_type = /obj/effect/energy_net
 
 /obj/item/energy_net/dropped(mob/user)
+	..()
 	spawn(10)
 		if(src) qdel(src)
 
diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm
index cebd607fa40..156aa31e423 100644
--- a/code/modules/artifice/deadringer.dm
+++ b/code/modules/artifice/deadringer.dm
@@ -24,6 +24,7 @@
 	..()
 
 /obj/item/deadringer/dropped(mob/user)
+	..()
 	if(timer > 20)
 		reveal()
 		watchowner = null
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index b445938eb35..2be487ed34a 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -64,6 +64,7 @@
 		time = initial(time)
 
 /obj/item/assembly/prox_sensor/dropped(mob/user)
+	..()
 	sense()
 
 /obj/item/assembly/prox_sensor/proc/toggle_scan()
diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm
index 10937273306..b55ca3e7afd 100644
--- a/code/modules/clothing/accessories/accessory_vr.dm
+++ b/code/modules/clothing/accessories/accessory_vr.dm
@@ -42,6 +42,7 @@
 	..(S, user)
 
 /obj/item/clothing/accessory/choker/dropped(mob/user)
+	..()
 	icon_override = icon_previous_override
 
 /obj/item/clothing/accessory/collar
@@ -80,6 +81,7 @@
 	..(S, user)
 
 /obj/item/clothing/accessory/collar/dropped(mob/user)
+	..()
 	icon_override = icon_previous_override
 
 /obj/item/clothing/accessory/collar/silver
diff --git a/code/modules/clothing/accessories/clothing.dm b/code/modules/clothing/accessories/clothing.dm
index 5b9aae59da5..ace3cebe0f4 100644
--- a/code/modules/clothing/accessories/clothing.dm
+++ b/code/modules/clothing/accessories/clothing.dm
@@ -188,6 +188,7 @@
 		update_clothing_icon()
 
 /obj/item/clothing/accessory/poncho/dropped(mob/user) //Resets the override to prevent the wrong .dmi from being used because equipped only triggers when wearing ponchos as suits.
+	..()
 	icon_override = null
 
 /obj/item/clothing/accessory/poncho/green
diff --git a/code/modules/clothing/gloves/gauntlets.dm b/code/modules/clothing/gloves/gauntlets.dm
index 0a27fbb0cb7..19c1a2c82ec 100644
--- a/code/modules/clothing/gloves/gauntlets.dm
+++ b/code/modules/clothing/gloves/gauntlets.dm
@@ -40,6 +40,7 @@
 	return 1
 
 /obj/item/clothing/gloves/gauntlets/dropped(mob/user)
+	..()
 	var/mob/living/carbon/human/H = wearer
 	if(gloves)
 		if(!H.equip_to_slot_if_possible(gloves, slot_gloves))
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 3d14d3910a5..89e68234b57 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -456,6 +456,7 @@
 
 
 /obj/item/hand/dropped(mob/user as mob)
+	..()
 	if(locate(/obj/structure/table, loc))
 		src.update_icon(user.dir)
 	else
diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm
index 7b680498415..9d9b04a918b 100644
--- a/code/modules/holomap/mapper.dm
+++ b/code/modules/holomap/mapper.dm
@@ -121,6 +121,7 @@
 	return ..()
 
 /obj/item/mapping_unit/dropped(mob/dropper)
+	..()
 	if(loc != dropper) // Not just a juggle
 		hide_device()
 
diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 06ab146ec6b..6e265f1c60e 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -341,6 +341,7 @@
 	var/obj/item/kinetic_crusher/machete/gauntlets/linked
 
 /obj/item/offhand/crushergauntlets/dropped(mob/user as mob)
+	SHOULD_CALL_PARENT(FALSE)
 	if(linked.wielded)
 		linked.ready_toggle(TRUE)
 
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 499d7089b5c..6ae65ff7c22 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -348,6 +348,7 @@
 		devour(affecting, assailant)
 
 /obj/item/grab/dropped(mob/user)
+	..()
 	loc = null
 	if(!QDELETED(src))
 		qdel(src)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index a43bab5c77c..40edbcef776 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2284,6 +2284,7 @@ Departamental Swimsuits, for general use
 	update_clothing_icon()
 
 /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped(mob/user)
+	..()
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
 
 /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user)
diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm
index 473200425c8..0d19579c0a2 100644
--- a/code/modules/vore/resizing/holder_vr.dm
+++ b/code/modules/vore/resizing/holder_vr.dm
@@ -3,6 +3,7 @@
 		var/held = held_mob
 		dump_mob()
 		held_mob = held
+	..()
 
 /obj/item/holder/attack_hand(mob/living/user as mob) //straight up just copypasted from objects/items.dm with a few things changed (doesn't called dropped unless +actually dropped+)
 	if (!user) return

From dedfeffe4b6917d1714abe5274082b44290cbbc6 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 6 Jan 2025 21:26:40 +0100
Subject: [PATCH 3/5] .

---
 code/game/objects/items/weapons/handcuffs.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 42fe4ae1ab4..b598c60cccf 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -302,6 +302,7 @@ var/last_chew = 0
 		return 1
 
 /obj/item/handcuffs/legcuffs/bola/dropped(mob/user)
+	..()
 	visible_message(span_infoplain(span_bold("\The [src]") + " falls apart!"))
 	qdel(src)
 

From e6062e62100e97b216d927fdcd6b6da96661f1fb Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Tue, 7 Jan 2025 21:54:58 +0100
Subject: [PATCH 4/5] cleanup

---
 code/_onclick/telekinesis.dm                           |  2 +-
 code/game/objects/items.dm                             |  2 +-
 code/game/objects/items/blueprints.dm                  |  2 +-
 code/game/objects/items/weapons/cigs_lighters.dm       |  2 +-
 code/game/objects/items/weapons/melee/energy.dm        |  2 +-
 code/game/objects/items/weapons/storage/backpack.dm    |  2 +-
 .../objects/items/weapons/storage/laundry_basket.dm    | 10 +++++-----
 code/game/objects/items/weapons/storage/storage.dm     |  2 +-
 code/game/objects/items/weapons/traps_vr.dm            |  2 +-
 code/modules/clothing/clothing.dm                      |  2 +-
 code/modules/clothing/head/pilot_helmet.dm             |  2 +-
 code/modules/clothing/masks/miscellaneous.dm           |  2 +-
 code/modules/clothing/shoes/magboots.dm                |  2 +-
 code/modules/clothing/spacesuits/rig/rig.dm            |  2 +-
 code/modules/games/cards.dm                            |  4 ++--
 code/modules/holomap/mapper.dm                         |  4 ++--
 code/modules/hydroponics/backtank.dm                   |  2 +-
 code/modules/mining/kinetic_crusher.dm                 |  2 +-
 code/modules/vore/fluffstuff/custom_items_vr.dm        |  2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 8785a479802..f6946a353dc 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -74,7 +74,7 @@ var/const/tk_maxrange = 15
 	var/atom/movable/focus = null
 	var/mob/living/host = null
 
-/obj/item/tk_grab/dropped(mob/user as mob)
+/obj/item/tk_grab/dropped(mob/user)
 	..()
 	if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item
 		if(focus.Adjacent(loc))
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 3ead10fe5da..d3627bd4f7b 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -378,7 +378,7 @@
 		playsound(src, drop_sound, 30, preference = /datum/preference/toggle/drop_sounds)
 
 // apparently called whenever an item is removed from a slot, container, or anything else.
-/obj/item/proc/dropped(mob/user as mob)
+/obj/item/proc/dropped(mob/user)
 	SHOULD_CALL_PARENT(TRUE)
 	if(zoom)
 		zoom() //binoculars, scope, etc
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 3d8e98bc6cf..684d69ba07a 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -330,7 +330,7 @@
 				usr.client.images.Remove(i)
 
 // Make sure to turn off the colors when we drop the blueprints.
-/obj/item/blueprints/dropped(mob/user as mob)
+/obj/item/blueprints/dropped(mob/user)
 	if(areaColor_turfs.len)
 		seeAreaColors_remove()
 	return ..()
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index e85596a9eda..6a30ca02fe4 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -48,7 +48,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		location.hotspot_expose(700, 5)
 		return
 
-/obj/item/flame/match/dropped(mob/user as mob)
+/obj/item/flame/match/dropped(mob/user)
 	//If dropped, put ourselves out
 	//not before lighting up the turf we land on, though.
 	if(lit)
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index c0f032ced7c..7997c6870c3 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -279,7 +279,7 @@
 
 	projectile_parry_chance = 65
 
-/obj/item/melee/energy/sword/dropped(var/mob/user)
+/obj/item/melee/energy/sword/dropped(mob/user)
 	..()
 	if(!istype(loc,/mob))
 		deactivate(user)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 843f3fa4fde..dc1f7100a04 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -26,7 +26,7 @@
 	..(user, slot)
 
 /*
-/obj/item/storage/backpack/dropped(mob/user as mob)
+/obj/item/storage/backpack/dropped(mob/user)
 	if (loc == user && src.use_sound)
 		playsound(src, src.use_sound, 50, 1, -5)
 	..(user)
diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm
index 30a74c04b23..5cfd391d738 100644
--- a/code/game/objects/items/weapons/storage/laundry_basket.dm
+++ b/code/game/objects/items/weapons/storage/laundry_basket.dm
@@ -58,21 +58,21 @@
 	return
 
 
-/obj/item/storage/laundry_basket/MouseDrop(obj/over_object as obj)
+/obj/item/storage/laundry_basket/MouseDrop(obj/over_object)
 	if(over_object == usr)
 		return
 	else
 		return ..()
 
-/obj/item/storage/laundry_basket/dropped(mob/user as mob)
+/obj/item/storage/laundry_basket/dropped(mob/user)
 	if(linked)
 		QDEL_NULL(linked)
 	return ..()
 
-/obj/item/storage/laundry_basket/show_to(mob/user as mob)
+/obj/item/storage/laundry_basket/show_to(mob/user)
 	return
 
-/obj/item/storage/laundry_basket/open(mob/user as mob)
+/obj/item/storage/laundry_basket/open(mob/user)
 
 
 //Offhand
@@ -82,7 +82,7 @@
 	name = "second hand"
 	use_to_pickup = FALSE
 
-/obj/item/storage/laundry_basket/offhand/dropped(mob/user as mob)
+/obj/item/storage/laundry_basket/offhand/dropped(mob/user)
 	SHOULD_CALL_PARENT(FALSE)
 	if(user.isEquipped(linked))
 		user.drop_from_inventory(linked)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 1e541394b89..e854d70a813 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -604,7 +604,7 @@
 	W.add_fingerprint(user)
 	return handle_item_insertion(W)
 
-/obj/item/storage/dropped(mob/user as mob)
+/obj/item/storage/dropped(mob/user)
 	return ..()
 
 /obj/item/storage/attack_hand(mob/user as mob)
diff --git a/code/game/objects/items/weapons/traps_vr.dm b/code/game/objects/items/weapons/traps_vr.dm
index 07530e8361c..d6ae54e7179 100644
--- a/code/game/objects/items/weapons/traps_vr.dm
+++ b/code/game/objects/items/weapons/traps_vr.dm
@@ -13,6 +13,6 @@
 			remove_verb(H, /mob/living/proc/shred_limb_temp)
 	..()
 
-/obj/item/beartrap/dropped(var/mob/user)
+/obj/item/beartrap/dropped(mob/user)
 	remove_verb(user, /mob/living/proc/shred_limb_temp)
 	..()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 49fde57ce59..410b3606a7d 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -61,7 +61,7 @@
 	if(enables_planes)
 		user.recalculate_vis()
 
-/obj/item/clothing/dropped(var/mob/user)
+/obj/item/clothing/dropped(mob/user)
 	..()
 	if(enables_planes)
 		user.recalculate_vis()
diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm
index b035fb5a4f4..90b17a89ab4 100644
--- a/code/modules/clothing/head/pilot_helmet.dm
+++ b/code/modules/clothing/head/pilot_helmet.dm
@@ -178,7 +178,7 @@
 		user.client.screen |= pilot_hud
 		user.client.images |= raw_images
 
-/obj/item/clothing/head/pilot/dropped(var/mob/user)
+/obj/item/clothing/head/pilot/dropped(mob/user)
 	. = ..()
 	if(user.client)
 		user.client.screen -= pilot_hud
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index be5dad9f667..1377fb1ba67 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -244,7 +244,7 @@
 			c.remove(eye)
 		eye.setLoc(user)
 
-/obj/item/clothing/mask/ai/dropped(var/mob/user)
+/obj/item/clothing/mask/ai/dropped(mob/user)
 	..()
 	if(eye.owner == user)
 		for(var/datum/chunk/c in eye.visibleChunks)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index d58de1f1628..37a64c15992 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -114,7 +114,7 @@
 	user.update_mob_action_buttons()
 
 //In case they somehow come off while enabled.
-/obj/item/clothing/shoes/magboots/vox/dropped(mob/user as mob)
+/obj/item/clothing/shoes/magboots/vox/dropped(mob/user)
 	..(user)
 	if(src.magpulse)
 		user.visible_message("The [src] go limp as they are removed from [usr]'s feet.", "The [src] go limp as they are removed from your feet.")
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 180b72b5890..181f3481e50 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -789,7 +789,7 @@
 	for(var/piece in list("helmet","gauntlets","chest","boots"))
 		toggle_piece(piece, H, ONLY_DEPLOY)
 
-/obj/item/rig/dropped(var/mob/user)
+/obj/item/rig/dropped(mob/user)
 	. = ..(user)
 	for(var/piece in list("helmet","gauntlets","chest","boots"))
 		toggle_piece(piece, user, ONLY_RETRACT)
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 89e68234b57..283acc5cfea 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -455,13 +455,13 @@
 		i++
 
 
-/obj/item/hand/dropped(mob/user as mob)
+/obj/item/hand/dropped(mob/user)
 	..()
 	if(locate(/obj/structure/table, loc))
 		src.update_icon(user.dir)
 	else
 		update_icon()
 
-/obj/item/hand/pickup(mob/user as mob)
+/obj/item/hand/pickup(mob/user)
 	..()
 	src.update_icon()
diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm
index 9d9b04a918b..ebea8ec6d27 100644
--- a/code/modules/holomap/mapper.dm
+++ b/code/modules/holomap/mapper.dm
@@ -120,9 +120,9 @@
 
 	return ..()
 
-/obj/item/mapping_unit/dropped(mob/dropper)
+/obj/item/mapping_unit/dropped(mob/user)
 	..()
-	if(loc != dropper) // Not just a juggle
+	if(loc != user) // Not just a juggle
 		hide_device()
 
 /obj/item/mapping_unit/attack_self(mob/user)
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index b2962061dc6..4d36d5b555d 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -115,7 +115,7 @@
 	else
 		return ..()
 
-/obj/item/watertank/dropped(var/mob/user)
+/obj/item/watertank/dropped(mob/user)
 	..()
 	remove_noz(user)
 
diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 6e265f1c60e..cd2191f1e57 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -340,7 +340,7 @@
 /obj/item/offhand/crushergauntlets
 	var/obj/item/kinetic_crusher/machete/gauntlets/linked
 
-/obj/item/offhand/crushergauntlets/dropped(mob/user as mob)
+/obj/item/offhand/crushergauntlets/dropped(mob/user)
 	SHOULD_CALL_PARENT(FALSE)
 	if(linked.wielded)
 		linked.ready_toggle(TRUE)
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 2ea513bad20..690020f8d1e 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1076,7 +1076,7 @@
 	allowed = list(/obj/item/shield/fluff/wolfgirlshield)
 	damtype = HALLOSS
 
-/obj/item/melee/fluffstuff/wolfgirlsword/dropped(var/mob/user)
+/obj/item/melee/fluffstuff/wolfgirlsword/dropped(mob/user)
 	..()
 	if(!istype(loc,/mob))
 		deactivate(user)

From c53b162af07ac8078bbec28953094c44e5565421 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:36:10 +0100
Subject: [PATCH 5/5] .

---
 code/game/area/areas.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index f9dcbe3f0b2..9a35493bf5f 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -564,7 +564,7 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image)
 		return
 	if(ourmob.client?.holder)
 		return
-	if(isanimal(ourmob))
+	if(issimplekin(ourmob))
 		var/mob/living/simple_mob/shadekin/SK = ourmob
 		if(SK.ability_flags & AB_PHASE_SHIFTED)
 			SK.phase_in(SK.loc)