cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 12:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Composting and grinding now drops trash items if applicable (#44946)

Browse Source 
Fixes bowls being lost when composting or grinding food in bowls.
This commit is contained in:
bgobandit
2019-07-04 12:52:37 -07:00
committed by Tad Hardesty
parent 1c7963aa71
commit d1ebea42b5
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/hydroponics.dm
+4
View File
@@ -699,6 +699,10 @@
var/transfer_amount
if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill))
if(istype(reagent_source, /obj/item/reagent_containers/food/snacks))
var/obj/item/reagent_containers/food/snacks/R = reagent_source
if (R.trash)
R.generate_trash(get_turf(user))
visi_msg="[user] composts [reagent_source], spreading it through [target]"
transfer_amount = reagent_source.reagents.total_volume
else
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+8
View File
@@ -256,6 +256,7 @@
if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
var/obj/item/I = i
check_trash(I)
if(I.juice_results)
juice_item(I)
@@ -275,6 +276,7 @@
if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
var/obj/item/I = i
check_trash(I)
if(I.grind_results)
grind_item(i, user)
@@ -287,6 +289,12 @@
I.reagents.trans_to(beaker, I.reagents.total_volume, transfered_by = user)
remove_object(I)
/obj/machinery/reagentgrinder/proc/check_trash(obj/item/I)
if (istype(I, /obj/item/reagent_containers/food/snacks))
var/obj/item/reagent_containers/food/snacks/R = I
if (R.trash)
R.generate_trash(get_turf(src))
/obj/machinery/reagentgrinder/proc/mix(mob/user)
//For butter and other things that would change upon shaking or mixing
power_change()