diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 0b46012b35f..83051e6e6c7 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -3,6 +3,7 @@ var/max_butts = 0 var/icon_half = "" var/icon_full = "" + var/material = /obj/item/stack/sheet/metal /obj/item/ashtray/Initialize(mapload) . = ..() @@ -51,10 +52,6 @@ else desc = initial(desc) -/obj/item/ashtray/deconstruct() - empty_tray() - qdel(src) - /obj/item/ashtray/proc/empty_tray() for(var/obj/item/I in contents) I.forceMove(loc) @@ -66,6 +63,14 @@ empty_tray() return ..() +/obj/item/ashtray/wrench_act(mob/user, obj/item/I) + . = TRUE + if(!I.use_tool(src, user, volume = I.tool_volume)) + return + empty_tray() + new material(drop_location(), 1) + deconstruct() + /obj/item/ashtray/plastic name = "plastic ashtray" desc = "Cheap plastic ashtray." @@ -74,7 +79,7 @@ icon_full = "ashtray_full_bl" max_butts = 8 max_integrity = 8 - materials = list(MAT_METAL=30, MAT_GLASS=30) + material = /obj/item/stack/sheet/plastic throwforce = 3 /obj/item/ashtray/bronze @@ -85,7 +90,6 @@ icon_full = "ashtray_full_br" max_butts = 16 max_integrity = 16 - materials = list(MAT_METAL=80) throwforce = 10 /obj/item/ashtray/glass @@ -96,5 +100,5 @@ icon_full = "ashtray_full_gl" max_butts = 12 max_integrity = 12 - materials = list(MAT_GLASS=60) + material = /obj/item/stack/sheet/glass throwforce = 6 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 43fb525e1f7..a2431dfeffc 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -305,6 +305,11 @@ LINEN BINS extinguish() update_icon() +/obj/structure/bedsheetbin/wrench_act(mob/user, obj/item/I) + if(user.a_intent == INTENT_HARM) + default_unfasten_wrench(user, I, time = 20) + return TRUE + /obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/bedsheet)) if(!user.drop_item()) diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 109fa61cde5..3512188f4e9 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -18,6 +18,10 @@ . = ..() AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_TRANQUILLITE), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack) +/obj/machinery/mineral/mint/wrench_act(mob/user, obj/item/I) + default_unfasten_wrench(user, I, time = 4 SECONDS) + return TRUE + /obj/machinery/mineral/mint/process() var/turf/T = get_step(src, input_dir) if(!T)