mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-12 15:47:04 +01:00
should call parent
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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!"))
|
||||
|
||||
@@ -122,6 +122,7 @@
|
||||
new /obj/effect/effect/sparks(T)
|
||||
|
||||
/obj/item/electric_hand/dropped(mob/user)
|
||||
..()
|
||||
spawn(1)
|
||||
if(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -283,6 +283,7 @@
|
||||
// Parameters: 0
|
||||
// Description: Deletes the spell object immediately.
|
||||
/obj/item/spell/dropped(mob/user)
|
||||
..()
|
||||
spawn(1)
|
||||
if(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -60,6 +60,7 @@
|
||||
var/net_type = /obj/effect/energy_net
|
||||
|
||||
/obj/item/energy_net/dropped(mob/user)
|
||||
..()
|
||||
spawn(10)
|
||||
if(src) qdel(src)
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
..()
|
||||
|
||||
/obj/item/deadringer/dropped(mob/user)
|
||||
..()
|
||||
if(timer > 20)
|
||||
reveal()
|
||||
watchowner = null
|
||||
|
||||
@@ -64,6 +64,7 @@
|
||||
time = initial(time)
|
||||
|
||||
/obj/item/assembly/prox_sensor/dropped(mob/user)
|
||||
..()
|
||||
sense()
|
||||
|
||||
/obj/item/assembly/prox_sensor/proc/toggle_scan()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -456,6 +456,7 @@
|
||||
|
||||
|
||||
/obj/item/hand/dropped(mob/user as mob)
|
||||
..()
|
||||
if(locate(/obj/structure/table, loc))
|
||||
src.update_icon(user.dir)
|
||||
else
|
||||
|
||||
@@ -121,6 +121,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/mapping_unit/dropped(mob/dropper)
|
||||
..()
|
||||
if(loc != dropper) // Not just a juggle
|
||||
hide_device()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -348,6 +348,7 @@
|
||||
devour(affecting, assailant)
|
||||
|
||||
/obj/item/grab/dropped(mob/user)
|
||||
..()
|
||||
loc = null
|
||||
if(!QDELETED(src))
|
||||
qdel(src)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user