cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-25 00:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes mapping processes not clearing up all flora (#55785)

Browse Source 
Such as spawning ruins or generating terrain. This also makes so cleaned rocks properly dont drop ash, but have to be mined
This commit is contained in:
Azarak
2020-12-30 02:44:08 +01:00
committed by GitHub
parent aa60dfc325
commit 14031d6daa
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/structures/flora.dm
View File

@@ -409,11 +409,6 @@
. = ..() . = ..()
icon_state = "[icon_state][rand(1,3)]" 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) /obj/structure/flora/rock/attackby(obj/item/W, mob/user, params)
if(!mineResult || W.tool_behaviour != TOOL_MINING) if(!mineResult || W.tool_behaviour != TOOL_MINING)
return ..() return ..()
@@ -422,6 +417,8 @@
to_chat(user, "<span class='notice'>You start mining...</span>") to_chat(user, "<span class='notice'>You start mining...</span>")
if(W.use_tool(src, user, 40, volume=50)) if(W.use_tool(src, user, 40, volume=50))
to_chat(user, "<span class='notice'>You finish mining the rock.</span>") to_chat(user, "<span class='notice'>You finish mining the rock.</span>")
if(mineResult && mineAmount)
new mineResult(loc, mineAmount)
SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type)
qdel(src) qdel(src)

2
code/modules/mapping/ruins.dm
View File

@@ -32,7 +32,7 @@
qdel(nest) qdel(nest)
for(var/mob/living/simple_animal/monster in T) for(var/mob/living/simple_animal/monster in T)
qdel(monster) qdel(monster)
for(var/obj/structure/flora/ash/plant in T) for(var/obj/structure/flora/plant in T)
qdel(plant) qdel(plant)
load(central_turf,centered = TRUE) load(central_turf,centered = TRUE)