mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 05:27:39 +01:00
Merge pull request #16889 from Kashargul/droppingPartTwo
properly forwards the user on dropped
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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]!"))
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -183,6 +183,6 @@
|
||||
playsound(src, 'sound/items/change_jaws.ogg', 30, 1)
|
||||
|
||||
if(equipping.loc != src)
|
||||
equipping.dropped()
|
||||
equipping.dropped(src)
|
||||
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user