mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
some dropped sanity
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
..()
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
|
||||
. = ..()
|
||||
update_holder()
|
||||
|
||||
/obj/item/gps/dropped()
|
||||
/obj/item/gps/dropped(mob/user)
|
||||
. = ..()
|
||||
update_holder()
|
||||
|
||||
|
||||
@@ -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)
|
||||
..()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/item/deadringer/dropped()
|
||||
/obj/item/deadringer/dropped(mob/user)
|
||||
if(timer > 20)
|
||||
reveal()
|
||||
watchowner = null
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/telecube/dropped()
|
||||
/obj/item/telecube/dropped(mob/user)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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")
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
..()
|
||||
|
||||
@@ -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
|
||||
wearer = null
|
||||
|
||||
@@ -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
|
||||
..()
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
..()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
..()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user