diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index d5f7c504a7a..7c472e99b46 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -409,11 +409,6 @@ . = ..() icon_state = "[icon_state][rand(1,3)]" -/obj/structure/flora/rock/Destroy() - if(mineResult && mineAmount) - new mineResult(loc, mineAmount) - . = ..() - /obj/structure/flora/rock/attackby(obj/item/W, mob/user, params) if(!mineResult || W.tool_behaviour != TOOL_MINING) return ..() @@ -422,6 +417,8 @@ to_chat(user, "You start mining...") if(W.use_tool(src, user, 40, volume=50)) to_chat(user, "You finish mining the rock.") + if(mineResult && mineAmount) + new mineResult(loc, mineAmount) SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) qdel(src) diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index 35edadd9f46..b322fe0cf7a 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -32,7 +32,7 @@ qdel(nest) for(var/mob/living/simple_animal/monster in T) qdel(monster) - for(var/obj/structure/flora/ash/plant in T) + for(var/obj/structure/flora/plant in T) qdel(plant) load(central_turf,centered = TRUE)