cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] some dropped sanity (#9856)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-12 09:34:37 -07:00
committed by GitHub
parent 6ba6be650c
commit 2d0719a4d4
64 changed files with 115 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items.dm
View File

@@ -379,7 +379,8 @@
playsound(src, drop_sound, 30, preference = /datum/preference/toggle/drop_sounds)
// apparently called whenever an item is removed from a slot, container, or anything else.
/obj/item/proc/dropped(mob/user as mob)
/obj/item/proc/dropped(mob/user)
SHOULD_CALL_PARENT(TRUE)
if(zoom)
zoom() //binoculars, scope, etc
appearance_flags &= ~NO_CLIENT_COLOR

2
code/game/objects/items/blueprints.dm
View File

@@ -337,7 +337,7 @@
usr.client.images.Remove(i)
// Make sure to turn off the colors when we drop the blueprints.
/obj/item/blueprints/dropped(mob/user as mob)
/obj/item/blueprints/dropped(mob/user)
if(areaColor_turfs.len)
seeAreaColors_remove()
return ..()

2
code/game/objects/items/devices/chameleonproj.dm
View File

@@ -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()
..()

2
code/game/objects/items/devices/gps.dm
View File

@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
. = ..()
update_holder()
/obj/item/gps/dropped()
/obj/item/gps/dropped(mob/user)
. = ..()
update_holder()

1
code/game/objects/items/devices/t_scanner.dm
View File

@@ -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"

2
code/game/objects/items/weapons/candle.dm
View File

@@ -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

2
code/game/objects/items/weapons/chewables.dm
View File

@@ -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)
..()

2
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -48,7 +48,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
location.hotspot_expose(700, 5)
return
/obj/item/flame/match/dropped(mob/user as mob)
/obj/item/flame/match/dropped(mob/user)
//If dropped, put ourselves out
//not before lighting up the turf we land on, though.
if(lit)

7
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -301,7 +301,8 @@ 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)
@@ -310,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]!"))

2
code/game/objects/items/weapons/material/twohanded.dm
View File

@@ -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)

5
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -279,7 +279,7 @@
projectile_parry_chance = 65
/obj/item/melee/energy/sword/dropped(var/mob/user)
/obj/item/melee/energy/sword/dropped(mob/user)
..()
if(!istype(loc,/mob))
deactivate(user)
@@ -453,7 +453,8 @@
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()

2
code/game/objects/items/weapons/melee/shock_maul.dm
View File

@@ -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

3
code/game/objects/items/weapons/mop_deploy.dm
View File

@@ -56,7 +56,8 @@
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()

2
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -34,7 +34,7 @@
..(user, slot)
/*
/obj/item/storage/backpack/dropped(mob/user as mob)
/obj/item/storage/backpack/dropped(mob/user)
if (loc == user && src.use_sound)
playsound(src, src.use_sound, 50, 1, -5)
..(user)

11
code/game/objects/items/weapons/storage/laundry_basket.dm
View File

@@ -58,21 +58,21 @@
return
/obj/item/storage/laundry_basket/MouseDrop(obj/over_object as obj)
/obj/item/storage/laundry_basket/MouseDrop(obj/over_object)
if(over_object == usr)
return
else
return ..()
/obj/item/storage/laundry_basket/dropped(mob/user as mob)
/obj/item/storage/laundry_basket/dropped(mob/user)
if(linked)
QDEL_NULL(linked)
return ..()
/obj/item/storage/laundry_basket/show_to(mob/user as mob)
/obj/item/storage/laundry_basket/show_to(mob/user)
return
/obj/item/storage/laundry_basket/open(mob/user as mob)
/obj/item/storage/laundry_basket/open(mob/user)
//Offhand
@@ -82,7 +82,8 @@
name = "second hand"
use_to_pickup = FALSE
/obj/item/storage/laundry_basket/offhand/dropped(mob/user as mob)
/obj/item/storage/laundry_basket/offhand/dropped(mob/user)
SHOULD_CALL_PARENT(FALSE)
if(user.isEquipped(linked))
user.drop_from_inventory(linked)
return

4
code/game/objects/items/weapons/storage/storage.dm
View File

@@ -614,8 +614,8 @@
W.add_fingerprint(user)
return handle_item_insertion(W)
/obj/item/storage/dropped(mob/user as mob)
return
/obj/item/storage/dropped(mob/user)
return ..()
/obj/item/storage/attack_hand(mob/user as mob)
if(ishuman(user) && !pocketable)

2
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -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

2
code/game/objects/items/weapons/traps_vr.dm
View File

@@ -13,6 +13,6 @@
remove_verb(H, /mob/living/proc/shred_limb_temp)
..()
/obj/item/beartrap/dropped(var/mob/user)
/obj/item/beartrap/dropped(mob/user)
remove_verb(user, /mob/living/proc/shred_limb_temp)
..()

1
code/game/objects/items/weapons/trays.dm
View File

@@ -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

3
code/game/objects/items/weapons/weaponry.dm
View File

@@ -59,7 +59,8 @@
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)