diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index efe047ebef..8785a47980 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 650b134800..6b49e7fed2 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 cb1938fc1c..cce2d1da01 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 3b4edc576f..59ed913073 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 e869e8b876..a18db49170 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 50fff1fdd6..a16f8491c3 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 b56b6f37c3..c0f032ced7 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 2498240660..2b2a9130f8 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 17d20f0456..30a74c04b2 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 5e24ac1da4..1e541394b8 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 1149d2f3ec..fdf512b299 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 79fe9ff8d1..568c5aebd1 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 cebd607fa4..156aa31e42 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 b445938eb3..2be487ed34 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 1093727330..b55ca3e7af 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 5b9aae59da..ace3cebe0f 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 0a27fbb0cb..19c1a2c82e 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 3d14d3910a..89e68234b5 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 7b68049841..9d9b04a918 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 06ab146ec6..6e265f1c60 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 499d7089b5..6ae65ff7c2 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 a43bab5c77..40edbcef77 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 473200425c..0d19579c0a 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