mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Merge pull request #6346 from Cyadox/Bug-Fixes-Only
Fixes Dissolve destroying worn items
This commit is contained in:
@@ -435,8 +435,9 @@
|
||||
if(H.mind)
|
||||
H.mind.transfer_to(nH) //Transfer mind to the new body - to regain vampire/changeling/antag status!
|
||||
//H.decomp_stage = 4
|
||||
H.drop_all()
|
||||
H.gib(1)
|
||||
else
|
||||
M.visible_message("<span class='danger'>[usr.name] melts into a pile of bloody viscera!</span>")
|
||||
M.drop_all()
|
||||
M.gib(1)
|
||||
|
||||
|
||||
@@ -10,8 +10,7 @@
|
||||
if(confirm != "Yes")
|
||||
return
|
||||
|
||||
for(var/obj/item/W in M)
|
||||
M.drop_from_inventory(W)
|
||||
M.drop_all()
|
||||
|
||||
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
|
||||
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
|
||||
|
||||
@@ -142,6 +142,12 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
// Drops all and only equipped items, including items in hand
|
||||
/mob/proc/drop_all()
|
||||
for (var/obj/item/I in get_all_slots())
|
||||
drop_from_inventory(I)
|
||||
|
||||
|
||||
//Drops the item in our hand - you can specify an item and a location to drop to
|
||||
/mob/proc/drop_item(var/obj/item/to_drop, var/atom/Target)
|
||||
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/mob/proc/drop_item() called tick#: [world.time]")
|
||||
|
||||
6
html/changelogs/Cyadox.yml
Normal file
6
html/changelogs/Cyadox.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
author: Cyadox
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: Removes Dissolve's ability to eat some worn items, no more naked ACKs!
|
||||
- tweak: Admin's Drop Everything slightly optimized
|
||||
- rscadd: All mobs now have a drop_all() procedure, removing all equipped items instantly.
|
||||
Reference in New Issue
Block a user