From e21e3d25c9cf4d5989c984eca7515cacf20e7108 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 12 Jan 2025 16:46:37 +0100 Subject: [PATCH] properly forwards the user on dropped --- code/game/objects/items/weapons/candle.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 4 ++-- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- code/modules/mob/inventory.dm | 2 +- code/modules/organs/internal/augment.dm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index b5b9e4a6ebd..e184066dee8 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -58,7 +58,7 @@ if(!wax) new/obj/item/trash/candle(src.loc) if(istype(src.loc, /mob)) - src.dropped() + src.dropped(src.loc) qdel(src) update_icon() if(istype(loc, /turf)) //start a fire if possible diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index b598c60cccf..c80d132e561 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -311,12 +311,12 @@ var/last_chew = 0 var/mob/living/carbon/human/H = target if(!istype(H)) - src.dropped() + src.dropped(user) return 0 if(!H.has_organ_for_slot(slot_legcuffed)) H.visible_message(span_infoplain(span_bold("\The [src]") + " slams into [H], but slides off!")) - src.dropped() + src.dropped(user) return 0 H.visible_message(span_danger("\The [H] has been snared by \the [src]!")) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 181f3481e50..af3249be7db 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -732,7 +732,7 @@ use_obj.canremove = TRUE holder.drop_from_inventory(use_obj) use_obj.forceMove(get_turf(src)) - use_obj.dropped() + use_obj.dropped(holder) use_obj.canremove = FALSE use_obj.forceMove(src) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 41defb12b33..6905a59f58b 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -140,7 +140,7 @@ var/list/slot_equipment_priority = list( \ return 0 W.forceMove(drop_location()) W.reset_plane_and_layer() - W.dropped() + W.dropped(src) return 0 // Removes an item from inventory and places it in the target atom. diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm index 495bb3a281a..e824902aacc 100644 --- a/code/modules/organs/internal/augment.dm +++ b/code/modules/organs/internal/augment.dm @@ -183,6 +183,6 @@ playsound(src, 'sound/items/change_jaws.ogg', 30, 1) if(equipping.loc != src) - equipping.dropped() + equipping.dropped(src) return 1