diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 127b77274c9..02e1527bbf3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -85759,7 +85759,7 @@ /turf/simulated/floor/engine, /area/engine/engineering) "tkb" = ( -/obj/structure/flora/junglebush/c, +/obj/structure/flora/junglebush, /obj/machinery/light{ dir = 4 }, @@ -95001,7 +95001,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "yib" = ( -/obj/structure/flora/junglebush/b, +/obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light{ dir = 4 diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 10fa6fb7fe5..9f1709124f3 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -392,8 +392,6 @@ icon_state = "[base_icon_state][rand(1, variations)]" . = ..() -/obj/structure/flora/grass/jungle/b //s34n todo: delete these and mapedit - //Jungle rocks /obj/structure/flora/rock/jungle @@ -422,9 +420,6 @@ icon_state = "[base_icon_state][rand(1, variations)]" . = ..() -/obj/structure/flora/junglebush/b //s34n todo: delete these and mapedit -/obj/structure/flora/junglebush/c //s34n todo: delete these and mapedit - /obj/structure/flora/junglebush/large icon = 'icons/obj/flora/largejungleflora.dmi' pixel_x = -16 diff --git a/tools/UpdatePaths/Scripts/19351_bushes.txt b/tools/UpdatePaths/Scripts/19351_bushes.txt new file mode 100644 index 00000000000..e4a44bba0e8 --- /dev/null +++ b/tools/UpdatePaths/Scripts/19351_bushes.txt @@ -0,0 +1,3 @@ +/obj/structure/flora/grass/jungle/b : /obj/structure/flora/grass/jungle +/obj/structure/flora/junglebush/b : /obj/structure/flora/junglebush +/obj/structure/flora/junglebush/c : /obj/structure/flora/junglebush