mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Merge pull request #4064 from VampyrBytes/trashNforks
Fixes forks producing trash/not leaving trash
This commit is contained in:
@@ -98,10 +98,18 @@
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/collected = new type
|
||||
collected.loc = U
|
||||
collected.reagents.remove_any(collected.reagents.total_volume)
|
||||
collected.trash = null
|
||||
if(reagents.total_volume > bitesize)
|
||||
reagents.trans_to(collected, bitesize)
|
||||
else
|
||||
reagents.trans_to(collected, reagents.total_volume)
|
||||
if(trash)
|
||||
var/obj/item/TrashItem
|
||||
if(ispath(trash,/obj/item))
|
||||
TrashItem = new trash(src)
|
||||
else if(istype(trash,/obj/item))
|
||||
TrashItem = trash
|
||||
TrashItem.forceMove(loc)
|
||||
qdel(src)
|
||||
return 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user