diff --git a/code/modules/chemistry/Chemistry-Tools.dm b/code/modules/chemistry/Chemistry-Tools.dm index 86ec5e2b49ce2..0898f3bc3a13a 100644 --- a/code/modules/chemistry/Chemistry-Tools.dm +++ b/code/modules/chemistry/Chemistry-Tools.dm @@ -421,6 +421,16 @@ proc/ui_describe_reagents(atom/A) I.reagents.trans_to(src, I.reagents.total_volume) qdel(I) + else if (istype(I, /obj/item/reagent_containers/bone_fragments)) + if(src.reagents.total_volume >= src.reagents.maximum_volume) + boutput(user, SPAN_ALERT("[src] is full.")) + return + + boutput(user, SPAN_NOTICE("You toss the [I] into the beaker.")) + + I.reagents.trans_to(src, I.reagents.total_volume) + qdel(I) + else if (istype(I, /obj/item/reagent_containers/food/snacks/breadloaf)) if (src.reagents.total_volume >= src.reagents.maximum_volume) boutput(user, SPAN_ALERT("[src] is full.")) diff --git a/code/modules/chemistry/Reagents-Misc.dm b/code/modules/chemistry/Reagents-Misc.dm index 901982ccd7130..bbe8302c2e6e9 100644 --- a/code/modules/chemistry/Reagents-Misc.dm +++ b/code/modules/chemistry/Reagents-Misc.dm @@ -3204,7 +3204,7 @@ datum fluid_g = 210 fluid_b = 210 - on_plant_life(var/obj/plantpot/P, var/datum/plantgrowth_tick/growth_tick) + on_plant_life(var/obj/machinery/plantpot/P, var/datum/plantgrowth_tick/growth_tick) growth_tick.harvests_bonus += 0.6 /////////////////////////// diff --git a/code/modules/materials/Mat_RawMaterials.dm b/code/modules/materials/Mat_RawMaterials.dm index 1ae7cbcefacc3..6f5e71b7238b8 100644 --- a/code/modules/materials/Mat_RawMaterials.dm +++ b/code/modules/materials/Mat_RawMaterials.dm @@ -405,6 +405,14 @@ ABSTRACT_TYPE(/obj/item/material_piece/rubber) default_material = "bone" uses_default_material_appearance = FALSE mat_changename = FALSE + attackby(obj/item/W, mob/user) + if(istype(W,/obj/item/extinguisher)) + playsound(src,"sound/impact_sounds/Crystal_Shatter_1.ogg",30) + var/obj/item/reagent_containers/bone_fragments/B = new(src) + B.set_loc(src.loc) + qdel(src) + else + playsound(src,"sound/impact_sounds/Crystal_Hit_1.ogg",30) /obj/item/material_piece/gnesis name = "wafer"