diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index b6a3b8eee16..fc34b2a7792 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -179,7 +179,7 @@ /turf/open/floor/iron, /area/ruin/planetengi) "aX" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "ba" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm index 283f8796583..d98aafc578e 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm @@ -37,7 +37,7 @@ /turf/open/floor/wood, /area/ruin/unpowered) "h" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors/nospawn) "j" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm index 5588c3043e9..d79fc1ea0a3 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm @@ -386,7 +386,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "kI" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "lm" = ( @@ -440,18 +440,18 @@ }, /area/ruin/pizzeria) "mN" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /obj/structure/sign/poster/official/moth_piping{ pixel_y = 32 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "nr" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "om" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "ow" = ( @@ -1229,7 +1229,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "NK" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "NL" = ( @@ -1275,7 +1275,7 @@ /turf/open/floor/iron/freezer, /area/ruin/pizzeria) "Pg" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/structure/railing{ dir = 4 }, @@ -1403,7 +1403,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors/nospawn) "Sm" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "Sw" = ( @@ -1573,7 +1573,7 @@ }, /area/ruin/pizzeria) "WH" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "WO" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm index 035d091871c..8049227634a 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm @@ -31,7 +31,7 @@ }, /area/ruin/powered/shuttle) "ht" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "hM" = ( @@ -89,7 +89,7 @@ /turf/open/openspace/icemoon/keep_below, /area/icemoon/underground/explored) "tD" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "uc" = ( @@ -232,7 +232,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "Fg" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "FS" = ( @@ -287,7 +287,7 @@ /obj/structure/railing{ color = "#8a7453" }, -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Nz" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index c322b7c33d0..972c3baf5a8 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -759,7 +759,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "kG" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "kP" = ( @@ -1055,7 +1055,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) "pf" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/structure/railing{ dir = 8 }, @@ -1128,7 +1128,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "qk" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "qv" = ( @@ -1573,7 +1573,7 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "zF" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "zO" = ( @@ -1603,7 +1603,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "zX" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /obj/structure/railing{ dir = 8 }, @@ -1879,7 +1879,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/flora/stump, +/obj/structure/flora/tree/stump, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "EZ" = ( @@ -2051,7 +2051,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "In" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /obj/machinery/light/small/broken/directional/east, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/plasma_facility) @@ -2311,7 +2311,7 @@ /turf/open/floor/plating, /area/ruin/plasma_facility/commons) "LZ" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Mc" = ( @@ -2384,7 +2384,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "Ne" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /obj/structure/railing{ dir = 8 }, @@ -2617,7 +2617,7 @@ /turf/open/floor/iron/grimy, /area/ruin/plasma_facility/commons) "PQ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "PR" = ( @@ -2634,7 +2634,7 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "PX" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "PZ" = ( @@ -2753,7 +2753,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Sf" = ( @@ -2876,7 +2876,7 @@ /turf/open/floor/plating, /area/ruin/plasma_facility/commons) "Ve" = ( -/obj/structure/flora/stump, +/obj/structure/flora/tree/stump, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Vy" = ( @@ -3041,7 +3041,7 @@ /turf/open/floor/iron/textured_large, /area/ruin/plasma_facility/commons) "Yl" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Yw" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index b899b1934bb..232a936dd97 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -20,7 +20,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "bY" = ( -/obj/structure/flora/stump, +/obj/structure/flora/tree/stump, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "cj" = ( @@ -97,7 +97,7 @@ /turf/closed/wall, /area/icemoon/underground/explored) "ks" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /obj/effect/mob_spawn/corpse/human/assistant, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -114,7 +114,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "lg" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/effect/decal/remains/human, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -143,8 +143,8 @@ /turf/open/floor/engine/cult, /area/ruin/powered) "mI" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/grass/both, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/grass/both/style_random, /obj/structure/fence{ dir = 8 }, @@ -162,14 +162,14 @@ /turf/open/floor/wood, /area/ruin/powered) "oF" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "pc" = ( /turf/open/misc/asteroid/snow/ice/icemoon, /area/icemoon/underground/explored) "pj" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "pH" = ( @@ -177,7 +177,7 @@ /turf/closed/wall/mineral/wood, /area/ruin/powered) "pI" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "pP" = ( @@ -319,7 +319,7 @@ /turf/open/floor/wood, /area/ruin/powered) "Bq" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Cd" = ( @@ -335,7 +335,7 @@ /turf/open/floor/engine/cult, /area/ruin/powered) "Dm" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "DI" = ( @@ -348,7 +348,7 @@ /turf/open/floor/iron/freezer, /area/ruin/powered) "DM" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Ed" = ( @@ -412,7 +412,7 @@ /turf/open/floor/carpet, /area/ruin/powered) "Kd" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "LZ" = ( @@ -481,14 +481,14 @@ /obj/item/restraints/legcuffs/beartrap{ armed = 1 }, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "QR" = ( /turf/closed/wall/rust, /area/ruin/powered) "Rv" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Sk" = ( @@ -506,12 +506,12 @@ /turf/open/floor/wood, /area/ruin/powered) "Tc" = ( -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "TW" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/grass/both, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "UI" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm index b737262d596..66be24914b9 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm @@ -11,7 +11,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "cv" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/powered/shuttle) @@ -26,12 +26,12 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/unexplored/rivers) "dq" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/green, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "el" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "eC" = ( @@ -103,8 +103,8 @@ /turf/open/floor/plating/icemoon, /area/ruin/powered/shuttle) "rS" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/green, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "st" = ( @@ -159,7 +159,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "yl" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "yF" = ( @@ -387,11 +387,11 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/ruin/powered/shuttle) "Tz" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "TG" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Ux" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm index a1cb2f8c224..9ee049e8986 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm @@ -118,7 +118,7 @@ /turf/template_noop, /area/template_noop) "Rr" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Si" = ( @@ -136,7 +136,7 @@ /turf/open/floor/grass/fairy, /area/ruin/powered/shuttle) "Xh" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass/fairy, /area/ruin/powered/shuttle) "XI" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm index 5537f6007da..687d65cfff9 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm @@ -238,7 +238,7 @@ pixel_x = -6; pixel_y = 6 }, -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "zr" = ( @@ -461,7 +461,7 @@ /turf/open/floor/iron/white, /area/ruin/powered/mailroom) "UB" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "US" = ( @@ -469,7 +469,7 @@ /turf/open/floor/iron/smooth_half, /area/ruin/powered/mailroom) "Vq" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Vz" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 97adcda35f2..fc7e397c1d7 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -164,7 +164,7 @@ /turf/open/floor/sepia, /area/ruin/powered/beach) "cP" = ( -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/stalky/style_random, /turf/open/water/beach/biodome, /area/ruin/powered/beach) "cV" = ( @@ -340,8 +340,8 @@ /turf/open/floor/pod/dark, /area/ruin/powered/beach) "iH" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/water/beach/biodome, /area/ruin/powered/beach) "jc" = ( @@ -381,7 +381,7 @@ /turf/open/misc/beach/sand, /area/ruin/powered/beach) "ks" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/item/toy/seashell, /turf/open/misc/beach/sand, /area/ruin/powered/beach) @@ -422,7 +422,7 @@ /turf/open/floor/plating, /area/ruin/powered/beach) "mG" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "nw" = ( @@ -504,7 +504,7 @@ /turf/open/floor/pod/light, /area/ruin/powered/beach) "qg" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/large/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "qt" = ( @@ -723,7 +723,7 @@ /turf/open/floor/wood, /area/ruin/powered/beach) "yO" = ( -/obj/structure/flora/junglebush, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "yT" = ( @@ -797,7 +797,7 @@ /turf/open/floor/pod/light, /area/ruin/powered/beach) "AG" = ( -/obj/structure/flora/rock/jungle, +/obj/structure/flora/rock/pile/jungle/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "AY" = ( @@ -897,7 +897,7 @@ /turf/open/floor/wood, /area/ruin/powered/beach) "Eu" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/water/beach/biodome, /area/ruin/powered/beach) "EE" = ( @@ -1108,8 +1108,8 @@ /turf/open/floor/pod/light, /area/ruin/powered/beach) "Kn" = ( -/obj/structure/flora/junglebush/large, -/obj/structure/flora/junglebush, +/obj/structure/flora/bush/large/style_random, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "Ky" = ( @@ -1353,7 +1353,7 @@ /turf/closed/wall/mineral/sandstone, /area/ruin/powered/beach) "SY" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "Ti" = ( @@ -1392,7 +1392,7 @@ /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) "UT" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/beach/sand, /area/ruin/powered/beach) "UZ" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index e381d3dc0e0..e1b1094cf63 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -65,7 +65,7 @@ /turf/open/misc/ice, /area/ruin/powered/snow_biodome) "ap" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aq" = ( @@ -118,18 +118,18 @@ /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "az" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aA" = ( /turf/open/floor/wood/parquet, /area/ruin/powered/snow_biodome) "aB" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aC" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aD" = ( @@ -156,7 +156,7 @@ /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aI" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aJ" = ( @@ -192,7 +192,7 @@ /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "aQ" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "aR" = ( @@ -376,7 +376,7 @@ /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) "Gi" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid/snow, /area/ruin/powered/snow_biodome) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index da434348cf2..c07877b9add 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -395,7 +395,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/elephant_graveyard) "Cn" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "Cu" = ( @@ -490,7 +490,7 @@ /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "Mx" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/structure/cable, /obj/item/pickaxe{ layer = 2.5; diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm index 853f7bcb313..d07438fb016 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm @@ -3,30 +3,30 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "c" = ( /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "d" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "e" = ( -/obj/structure/flora/rock/jungle, +/obj/structure/flora/rock/pile/jungle/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "f" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "g" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "h" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "i" = ( @@ -50,7 +50,7 @@ /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "n" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "p" = ( @@ -61,12 +61,12 @@ /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "q" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "r" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /mob/living/simple_animal/butterfly{ atmos_requirements = list() }, @@ -77,22 +77,22 @@ /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "t" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "v" = ( -/obj/structure/flora/tree/jungle, +/obj/structure/flora/tree/jungle/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "w" = ( /turf/closed/mineral/volcanic/lava_land_surface, /area/ruin/unpowered/gaia) "A" = ( -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/stalky/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "B" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /mob/living/simple_animal/hostile/lightgeist{ AIStatus = 1; light_color = "#42ECFF" @@ -100,7 +100,7 @@ /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "C" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/grass/lavaland, /area/ruin/unpowered/gaia) "D" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 3cbf287f2f3..2bf659a4945 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -491,16 +491,16 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /obj/structure/disposaloutlet, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /obj/machinery/light/directional/north, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) "bn" = ( /obj/structure/window/spawner/east, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) "bo" = ( @@ -536,27 +536,27 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) "br" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/bush/sunny/style_random, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) "bs" = ( /obj/structure/window/spawner/east, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) "bt" = ( /obj/structure/window/spawner, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) "bu" = ( /obj/structure/window/spawner/east, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/effect/decal/cleanable/glass, /turf/open/misc/grass/lavaland, /area/ruin/powered/seedvault) diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 820ba2ce84c..925c93844f5 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -15,30 +15,30 @@ /turf/closed/mineral/random, /area/ruin/space/has_grav/abandonedzoo) "al" = ( -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "ao" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "aq" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "at" = ( /turf/closed/wall/r_wall, /area/ruin/space/has_grav/abandonedzoo) "av" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "aA" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "aC" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) "aD" = ( @@ -196,14 +196,14 @@ /turf/open/floor/iron/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bu" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bv" = ( /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bx" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "by" = ( @@ -227,7 +227,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bE" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bF" = ( @@ -239,7 +239,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bI" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bJ" = ( @@ -388,7 +388,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "nY" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /mob/living/simple_animal/hostile/bee, /turf/open/floor/grass, /area/ruin/space/has_grav/abandonedzoo) @@ -442,7 +442,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/abandonedzoo) "Ap" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid, /area/ruin/space/has_grav/abandonedzoo) "Ct" = ( @@ -528,7 +528,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/abandonedzoo) "RD" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/machinery/light/directional/south, /turf/open/misc/asteroid, /area/ruin/space/has_grav/abandonedzoo) @@ -553,7 +553,7 @@ /turf/open/misc/asteroid, /area/ruin/space/has_grav/abandonedzoo) "Xx" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid, /area/ruin/space/has_grav/abandonedzoo) "YJ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/clownplanet.dmm b/_maps/RandomRuins/SpaceRuins/clownplanet.dmm index f082db442d9..5bc83adeda5 100644 --- a/_maps/RandomRuins/SpaceRuins/clownplanet.dmm +++ b/_maps/RandomRuins/SpaceRuins/clownplanet.dmm @@ -11,7 +11,7 @@ /turf/open/floor/bronze, /area/ruin/powered/clownplanet) "ad" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/floor/bronze, /area/ruin/powered/clownplanet) "ae" = ( @@ -39,7 +39,7 @@ }, /area/ruin/powered/clownplanet) "ak" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -57,7 +57,7 @@ }, /area/ruin/powered/clownplanet) "an" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -70,19 +70,19 @@ }, /area/ruin/powered/clownplanet) "ap" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "aq" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "ar" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -97,7 +97,7 @@ /turf/open/floor/iron/bluespace, /area/ruin/powered/clownplanet) "au" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -114,7 +114,7 @@ /turf/open/floor/iron/bluespace, /area/ruin/powered/clownplanet) "ay" = ( -/obj/structure/flora/tree/jungle, +/obj/structure/flora/tree/jungle/style_random, /turf/open/floor/iron/bluespace, /area/ruin/powered/clownplanet) "az" = ( @@ -124,13 +124,13 @@ }, /area/ruin/powered/clownplanet) "aA" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "aB" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -177,7 +177,7 @@ /turf/open/misc/asteroid, /area/ruin/powered/clownplanet) "aK" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass{ color = "#1eff00" }, @@ -191,7 +191,7 @@ }, /area/ruin/powered/clownplanet) "aM" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -205,7 +205,7 @@ /turf/open/floor/bronze, /area/ruin/powered/clownplanet) "aO" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -222,13 +222,13 @@ }, /area/ruin/powered/clownplanet) "aQ" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "aR" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -243,7 +243,7 @@ }, /area/ruin/powered/clownplanet) "aT" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass{ color = "#1eff00" @@ -280,7 +280,7 @@ }, /area/ruin/powered/clownplanet) "aY" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -289,21 +289,21 @@ }, /area/ruin/powered/clownplanet) "aZ" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "ba" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass{ color = "#1eff00" }, /area/ruin/powered/clownplanet) "bb" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -328,7 +328,7 @@ }, /area/ruin/powered/clownplanet) "be" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm index 9d6999c136e..7d117317c4b 100644 --- a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm +++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm @@ -19,11 +19,11 @@ /turf/open/floor/grass, /area/ruin/space/has_grav) "f" = ( -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "g" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "h" = ( @@ -31,7 +31,7 @@ /turf/open/floor/grass, /area/ruin/space/has_grav) "i" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "j" = ( @@ -43,27 +43,27 @@ /turf/open/floor/grass, /area/ruin/space/has_grav) "l" = ( -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "m" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "n" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "o" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "p" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "q" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "r" = ( @@ -71,11 +71,11 @@ /turf/open/floor/grass, /area/ruin/space/has_grav) "s" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/large/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "t" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav) "u" = ( diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index 8ee03bb502e..f9f88b4a21b 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -272,7 +272,7 @@ /turf/open/floor/cult, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "he" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/airless, /area/ruin/unpowered/no_grav) "hk" = ( @@ -2349,7 +2349,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Yi" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/asteroid/airless, /area/ruin/unpowered/no_grav) "Ym" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 72b7ca9c96c..74474f24b68 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1174,11 +1174,11 @@ /turf/open/floor/carpet/blue, /area/ruin/space/has_grav/hotel) "kk" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/junglebush/c, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/jungle/c/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/window/fulltile, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel/bar) @@ -2930,11 +2930,11 @@ /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/hotel/bar) "Ez" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/junglebush/c, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/jungle/c/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/window/fulltile, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) @@ -3563,11 +3563,11 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) "MJ" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/junglebush/c, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/jungle/c/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/effect/spawner/structure/window, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) diff --git a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm index 3e461d5af5e..a7d0330ac28 100644 --- a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm +++ b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm @@ -337,9 +337,7 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/thelizardsgas) "Hc" = ( -/obj/structure/flora/rock/pile{ - icon_state = "basalt" - }, +/obj/structure/flora/rock, /turf/open/misc/asteroid/airless, /area/ruin/space/has_grav/thelizardsgas) "Io" = ( @@ -503,7 +501,7 @@ }, /area/ruin/space/has_grav/thelizardsgas) "Um" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/airless, /area/ruin/space/has_grav/thelizardsgas) "UO" = ( diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 0bab3ae23d5..c983795887e 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -3679,7 +3679,7 @@ /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "pL" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/snowforest) "qe" = ( @@ -3983,7 +3983,7 @@ /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "xy" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/snowforest) "xJ" = ( @@ -4150,7 +4150,7 @@ /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "Ao" = ( -/obj/structure/flora/rock/icy{ +/obj/structure/flora/rock/icy/style_random{ desc = "A mountain rock." }, /turf/open/misc/asteroid/snow/snow_cabin, @@ -4203,7 +4203,7 @@ /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "BZ" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "CA" = ( @@ -4255,7 +4255,7 @@ /turf/open/floor/iron/dark, /area/awaymission/cabin/caves/mountain) "Fz" = ( -/obj/structure/flora/rock/icy{ +/obj/structure/flora/rock/icy/style_random{ desc = "A mountain rock." }, /turf/open/misc/asteroid/snow/snow_cabin, @@ -4303,7 +4303,7 @@ /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/snowforest) "Ho" = ( -/obj/structure/flora/stump{ +/obj/structure/flora/tree/stump{ desc = "Breaking it should be easy."; max_integrity = 20; name = "old stump" @@ -4403,7 +4403,7 @@ /turf/open/indestructible, /area/awaymission/cabin/caves/mountain) "LF" = ( -/obj/structure/flora/stump{ +/obj/structure/flora/tree/stump{ desc = "Breaking it should be easy."; max_integrity = 20; name = "old stump" @@ -4545,7 +4545,7 @@ /turf/open/floor/wood/freezing, /area/awaymission/cabin/lumbermill) "OZ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "Pd" = ( @@ -4592,7 +4592,7 @@ /turf/open/indestructible, /area/awaymission/cabin/caves/mountain) "QL" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin) "QT" = ( @@ -4613,7 +4613,7 @@ /turf/open/floor/mineral/plastitanium/red/snow_cabin, /area/awaymission/cabin/caves/sovietcave) "Rs" = ( -/obj/structure/flora/stump{ +/obj/structure/flora/tree/stump{ desc = "Breaking it should be easy."; max_integrity = 20; name = "old stump" @@ -4691,7 +4691,7 @@ /turf/open/floor/iron/dark, /area/awaymission/cabin/caves/mountain) "Sd" = ( -/obj/structure/flora/stump{ +/obj/structure/flora/tree/stump{ desc = "Breaking it should be easy."; max_integrity = 20; name = "old stump" @@ -4825,7 +4825,7 @@ set_cap = 3; set_luminosity = 6 }, -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) "UO" = ( diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 2c536f12c38..3395b7b011b 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -89,11 +89,11 @@ /turf/open/misc/beach/coastline_b, /area/awaymission/beach) "as" = ( -/obj/structure/flora/rock{ +/obj/structure/flora/rock/style_random{ desc = "A volcanic rock."; name = "coastal rock" }, -/obj/structure/flora/ausbushes/stalkybush{ +/obj/structure/flora/bush/stalky/style_random{ desc = "It can't be smoked."; name = "sea weed" }, @@ -106,7 +106,7 @@ }, /area/awaymission/beach) "at" = ( -/obj/structure/flora/rock{ +/obj/structure/flora/rock/style_random{ desc = "A volcanic rock."; name = "coastal rock" }, diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 08aa8ac8fde..c364626c4ec 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -1392,7 +1392,7 @@ /turf/open/floor/iron, /area/awaymission/caves/northblock) "hT" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, @@ -1634,7 +1634,7 @@ }, /area/awaymission/caves/bmp_asteroid/level_two) "yV" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/item/soulstone/anybody, /turf/open/misc/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" @@ -1647,7 +1647,7 @@ }, /area/awaymission/caves/bmp_asteroid) "zH" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, @@ -1908,7 +1908,7 @@ /turf/open/floor/wood, /area/awaymission/caves/northblock) "Mq" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 2bfd1dd611e..13e7b60282c 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -3460,7 +3460,7 @@ /turf/open/floor/iron/white, /area/awaymission/research/interior/escapepods) "mK" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1; @@ -3469,7 +3469,7 @@ /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) "mL" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1; @@ -3478,7 +3478,7 @@ /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) "mM" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1; diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index f5dc935eda2..3b9ff7b8594 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -4962,8 +4962,8 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post) "ng" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/tree/pine, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "nh" = ( @@ -5042,7 +5042,7 @@ }, /area/awaymission/snowdin/post/engineering) "nr" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) "ns" = ( @@ -5367,8 +5367,8 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) "ov" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/bush, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "ow" = ( @@ -6000,7 +6000,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "qg" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=82;plasma=24;TEMP=120"; temperature = 120 @@ -6886,7 +6886,7 @@ /turf/closed/wall/ice, /area/awaymission/snowdin/outside) "ts" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /obj/effect/light_emitter{ name = "outdoor light"; set_cap = 3; @@ -7337,7 +7337,7 @@ /area/awaymission/snowdin/post/broken_shuttle) "wd" = ( /obj/item/shard, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "wm" = ( @@ -8949,7 +8949,7 @@ /turf/closed/wall/mineral/plastitanium, /area/awaymission/snowdin/outside) "Cu" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "Cv" = ( @@ -10400,8 +10400,8 @@ /turf/closed/wall, /area/awaymission/snowdin/post/mining_main/robotics) "IL" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "IN" = ( @@ -11052,7 +11052,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) "KC" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) "KD" = ( @@ -11679,7 +11679,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "Nz" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) "NA" = ( @@ -12116,7 +12116,7 @@ }, /area/awaymission/snowdin/outside) "Qc" = ( -/obj/structure/flora/stump, +/obj/structure/flora/tree/stump, /obj/effect/light_emitter{ name = "outdoor light"; set_cap = 3; @@ -12289,8 +12289,8 @@ /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) "QQ" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "QR" = ( @@ -12431,7 +12431,7 @@ /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) "RN" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /obj/effect/light_emitter{ name = "outdoor light"; set_cap = 3; @@ -12738,7 +12738,7 @@ set_cap = 3; set_luminosity = 6 }, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "Te" = ( @@ -12820,7 +12820,7 @@ /turf/open/floor/engine/n2, /area/awaymission/snowdin/post/engineering) "TI" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "TJ" = ( @@ -13039,7 +13039,7 @@ }, /area/awaymission/snowdin/cave) "UT" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) "Va" = ( @@ -13389,7 +13389,7 @@ /turf/open/floor/iron/white, /area/awaymission/snowdin/post/mining_main/robotics) "Xo" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/effect/light_emitter{ name = "outdoor light"; set_cap = 3; @@ -13503,8 +13503,8 @@ /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) "XX" = ( -/obj/structure/flora/bush, -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "XY" = ( @@ -13632,7 +13632,7 @@ /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) "YE" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "YF" = ( @@ -13733,7 +13733,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/secpost) "Zn" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /obj/effect/light_emitter{ name = "outdoor light"; set_cap = 3; @@ -13834,7 +13834,7 @@ /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/post/garage) "ZK" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) "ZM" = ( @@ -13856,7 +13856,7 @@ /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) "ZX" = ( -/obj/structure/flora/stump, +/obj/structure/flora/tree/stump, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index accc6bb804b..ef50c8e9627 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1914,13 +1914,13 @@ }, /area/awaymission/undergroundoutpost45/central) "eA" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass{ heat_capacity = 1e+006 }, /area/awaymission/undergroundoutpost45/central) "eB" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass{ heat_capacity = 1e+006 }, @@ -2004,7 +2004,7 @@ }, /area/awaymission/undergroundoutpost45/central) "eO" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass{ heat_capacity = 1e+006 }, diff --git a/_maps/map_files/CTF/cruiser.dmm b/_maps/map_files/CTF/cruiser.dmm index 734f12b2ee1..dbcf32e580d 100644 --- a/_maps/map_files/CTF/cruiser.dmm +++ b/_maps/map_files/CTF/cruiser.dmm @@ -98,7 +98,7 @@ /obj/structure/window/reinforced{ resistance_flags = 64 }, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/ctf) "dS" = ( @@ -583,7 +583,7 @@ /obj/structure/window/reinforced{ resistance_flags = 64 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/ctf) "Hy" = ( @@ -622,7 +622,7 @@ /obj/structure/window/reinforced{ resistance_flags = 64 }, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/ctf) "HZ" = ( diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/map_files/CTF/downtown.dmm index 56de607d474..2879ec28cde 100644 --- a/_maps/map_files/CTF/downtown.dmm +++ b/_maps/map_files/CTF/downtown.dmm @@ -69,7 +69,7 @@ /turf/open/floor/iron, /area/ctf) "bg" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/misc/grass, /area/ctf) "bs" = ( @@ -1852,7 +1852,7 @@ /turf/open/floor/iron, /area/ctf) "KL" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/grass, /area/ctf) "KN" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 6a61294247a..f0ab99343ba 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -8649,8 +8649,8 @@ /turf/open/floor/iron, /area/station/maintenance/disposal) "cmi" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/leavy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmj" = ( @@ -8682,9 +8682,9 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "cmG" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/rock/pile, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/rock/pile/style_random, /obj/machinery/light/floor, /turf/open/misc/grass, /area/station/hallway/primary/fore) @@ -8767,8 +8767,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "cnK" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /obj/machinery/light/floor, /turf/open/misc/grass, /area/station/hallway/primary/fore) @@ -10798,9 +10798,9 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "cRA" = ( -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/pointybush, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cRQ" = ( @@ -13649,8 +13649,8 @@ /turf/open/floor/iron/dark, /area/station/service/library/abandoned) "dMy" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/leavy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "dMA" = ( @@ -18747,8 +18747,8 @@ /turf/open/space, /area/station/solars/starboard/fore) "fju" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fjx" = ( @@ -19971,9 +19971,9 @@ /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "fzw" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/rock/jungle, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fzx" = ( @@ -29498,10 +29498,10 @@ /turf/open/floor/iron, /area/station/security/execution/transfer) "ihF" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/rock/pile, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "ihN" = ( @@ -37803,10 +37803,10 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "kre" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) @@ -43620,10 +43620,10 @@ }, /area/station/engineering/atmos/pumproom) "lTH" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) @@ -44568,8 +44568,8 @@ /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "mhj" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/rock/jungle, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/floor, /turf/open/misc/grass, /area/station/hallway/primary/fore) @@ -45161,8 +45161,8 @@ /turf/open/floor/carpet, /area/station/command/bridge) "moY" = ( -/obj/structure/flora/tree/jungle, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/tree/jungle/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "mpa" = ( @@ -55333,8 +55333,8 @@ /turf/open/floor/plating, /area/station/cargo/office) "pbk" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/reed/style_random, +/obj/structure/flora/bush/leavy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "pbm" = ( @@ -59838,8 +59838,8 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "qjr" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/flora/junglebush/c, +/obj/structure/flora/bush/sunny/style_random, +/obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "qjy" = ( @@ -63210,8 +63210,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "rhK" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rhV" = ( @@ -63941,8 +63941,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "rtT" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rtX" = ( @@ -69013,9 +69013,9 @@ /turf/open/floor/plating, /area/station/cargo/storage) "sJj" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes, -/obj/structure/flora/junglebush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/style_random, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "sJm" = ( @@ -76375,8 +76375,8 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "uCY" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/light/floor, /turf/open/misc/grass, /area/station/hallway/primary/fore) @@ -76817,9 +76817,9 @@ /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hos) "uKD" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/rock, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/rock/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "uKI" = ( @@ -79847,7 +79847,7 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "vys" = ( -/obj/structure/flora/junglebush/c, +/obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "vyF" = ( @@ -84153,9 +84153,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "wCc" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/large/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "wCd" = ( @@ -85644,9 +85644,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "xap" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) "xav" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8cf630011c9..225f3c43d0e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -28,7 +28,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "aaK" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/security/prison/safe) "aaT" = ( @@ -1126,7 +1126,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) "atW" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "aue" = ( @@ -5698,7 +5698,7 @@ /turf/open/floor/iron/dark, /area/station/security/execution/education) "bRb" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/security/prison/safe) "bRd" = ( @@ -8028,7 +8028,7 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "cCb" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "cCe" = ( @@ -8966,7 +8966,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "cSc" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/closet/crate{ name = "Le Caisee D'abeille" }, @@ -9245,7 +9245,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/standard_air, /area/station/hallway/secondary/exit/departure_lounge) "cXl" = ( @@ -10775,7 +10775,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "dvi" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/structure/railing, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) @@ -10808,7 +10808,7 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "dvY" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "dwv" = ( @@ -11851,7 +11851,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/misc/asteroid/snow/standard_air, /area/station/hallway/secondary/exit/departure_lounge) "dMH" = ( @@ -12673,7 +12673,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "ebd" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "ebq" = ( @@ -13657,7 +13657,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "esF" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "esW" = ( @@ -16701,7 +16701,7 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "fsm" = ( -/obj/structure/flora/rock/pile/icy, +/obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "fsv" = ( @@ -17273,7 +17273,7 @@ /area/station/maintenance/port/fore) "fDH" = ( /obj/machinery/light/directional/north, -/obj/structure/flora/rock/jungle, +/obj/structure/flora/rock/pile/jungle/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/virology) @@ -25635,7 +25635,7 @@ /turf/open/floor/iron, /area/station/science/misc_lab) "ijY" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "ijZ" = ( @@ -25749,7 +25749,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "ilZ" = ( @@ -27827,7 +27827,7 @@ /turf/open/floor/plating, /area/station/engineering/supermatter) "iUO" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "iUT" = ( @@ -28799,7 +28799,7 @@ /turf/open/floor/iron/white, /area/station/maintenance/port/fore) "jlq" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) @@ -29657,7 +29657,7 @@ /turf/open/floor/plating, /area/mine/eva/lower) "jAv" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "jAO" = ( @@ -29708,8 +29708,8 @@ /turf/open/floor/plating, /area/station/science/xenobiology) "jBq" = ( -/obj/structure/flora/tree/jungle, -/obj/structure/flora/junglebush, +/obj/structure/flora/tree/jungle/style_random, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "jBw" = ( @@ -31023,7 +31023,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/standard_air, /area/station/hallway/secondary/exit/departure_lounge) "jUY" = ( @@ -31234,7 +31234,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "jZi" = ( @@ -32923,7 +32923,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/junglebush, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "kAZ" = ( @@ -33320,7 +33320,7 @@ /turf/open/openspace, /area/station/science/xenobiology) "kHV" = ( -/obj/structure/flora/junglebush, +/obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "kIi" = ( @@ -33843,7 +33843,7 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "kPw" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "kPC" = ( @@ -34611,7 +34611,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "lbf" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /obj/effect/landmark/blobstart, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) @@ -35244,7 +35244,7 @@ /area/station/hallway/primary/central) "lkO" = ( /obj/effect/landmark/event_spawn, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "lkS" = ( @@ -36245,7 +36245,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "lBD" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "lBR" = ( @@ -39348,7 +39348,7 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "mHw" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "mHB" = ( @@ -40177,7 +40177,7 @@ name = "Terrarium"; req_access_txt = "35" }, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -41289,7 +41289,7 @@ /area/station/security/prison) "npV" = ( /obj/structure/window/reinforced/spawner, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/light/warm/directional/north, /turf/open/misc/ashplanet/wateryrock{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -41491,7 +41491,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "ntK" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "ntT" = ( @@ -45462,7 +45462,7 @@ /area/station/commons/vacant_room/office) "oCT" = ( /obj/item/instrument/harmonica, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /obj/machinery/light/small/directional/west, /turf/open/floor/grass, /area/station/security/prison/safe) @@ -47180,7 +47180,7 @@ /turf/open/floor/iron, /area/station/security/prison/visit) "pfw" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "pfO" = ( @@ -47558,7 +47558,7 @@ /area/station/tcommsat/computer) "pnq" = ( /obj/machinery/light/small/directional/north, -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) "pnA" = ( @@ -48426,7 +48426,7 @@ /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/disposal/incinerator) "pBN" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/station/security/warden) "pBV" = ( @@ -50986,7 +50986,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/security/warden) "qsu" = ( @@ -52819,7 +52819,7 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "qXO" = ( -/obj/structure/flora/junglebush/c, +/obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, /area/station/medical/virology) "qXY" = ( @@ -58066,7 +58066,7 @@ /turf/open/floor/plating, /area/station/maintenance/fore/greater) "sLr" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner, /obj/item/throwing_star/toy, @@ -59594,7 +59594,7 @@ /turf/open/floor/iron, /area/station/command/gateway) "too" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "toq" = ( @@ -62208,7 +62208,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "uer" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "ueu" = ( @@ -62626,8 +62626,8 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "ulj" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/green, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "ulk" = ( @@ -63544,7 +63544,7 @@ /turf/open/floor/iron, /area/station/commons/fitness) "uBy" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /obj/structure/railing{ dir = 9 }, @@ -63606,7 +63606,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "uCo" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /obj/item/shovel, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) @@ -71789,7 +71789,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "xfZ" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "xga" = ( @@ -71841,7 +71841,7 @@ /turf/open/openspace, /area/station/service/hydroponics) "xgB" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/structure/window/reinforced/spawner, /turf/open/misc/asteroid/snow/icemoon, /area/station/maintenance/port/aft) @@ -73515,7 +73515,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "xJF" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "xJG" = ( @@ -74385,7 +74385,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "xYw" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "xYA" = ( @@ -74627,8 +74627,8 @@ /area/station/maintenance/department/cargo) "ycj" = ( /obj/structure/window/reinforced/spawner, -/obj/structure/flora/junglebush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/ashplanet/wateryrock{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 18e7bd60550..dd224cf5170 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -70,7 +70,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "aaO" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "aaQ" = ( @@ -156,7 +156,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "abJ" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "abM" = ( @@ -293,26 +293,26 @@ /turf/open/space/basic, /area/space/nearstation) "acW" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "acZ" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "add" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "adf" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "adg" = ( @@ -3133,8 +3133,8 @@ /turf/open/floor/iron, /area/station/cargo/storage) "aTb" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "aTe" = ( @@ -3216,7 +3216,7 @@ /turf/open/floor/iron/goonplaque, /area/station/security/brig) "aUz" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "aUU" = ( @@ -3921,7 +3921,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "bjz" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "bjB" = ( @@ -3968,7 +3968,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/cmo) "bjR" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "bkn" = ( @@ -5558,7 +5558,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "bHP" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/structure/chair, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) @@ -5654,7 +5654,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "bKl" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "bKA" = ( @@ -5847,21 +5847,21 @@ /turf/open/floor/plating, /area/station/science/xenobiology) "bPK" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bPP" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bPR" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -5880,13 +5880,13 @@ "bPZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bQb" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "bQn" = ( @@ -6108,7 +6108,7 @@ "bTT" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bTZ" = ( @@ -6135,7 +6135,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -6143,7 +6143,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bUk" = ( @@ -6170,7 +6170,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -6193,7 +6193,7 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "bUy" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6205,7 +6205,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/corner, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bUC" = ( @@ -6221,20 +6221,20 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bUE" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) "bUF" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -7270,9 +7270,9 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" @@ -7607,12 +7607,12 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "cnM" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/space/nearstation) "cnQ" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/space/nearstation) @@ -7621,7 +7621,7 @@ /turf/open/floor/plating, /area/space/nearstation) "cog" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/space/nearstation) @@ -7693,7 +7693,7 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "coy" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) "coz" = ( @@ -7780,7 +7780,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "cqE" = ( -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "cqO" = ( @@ -8360,7 +8360,7 @@ /turf/open/space/basic, /area/space) "cBD" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/space/nearstation) @@ -8382,7 +8382,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) "cBN" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/space/nearstation) @@ -9450,9 +9450,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/reed/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "cSl" = ( @@ -9478,7 +9478,7 @@ }, /area/station/maintenance/port/aft) "cSq" = ( -/obj/structure/flora/rock/pile{ +/obj/structure/flora/rock/pile/style_random{ pixel_x = 8; pixel_y = 3 }, @@ -10767,9 +10767,9 @@ /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/hop) "dkA" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /obj/machinery/light/small/directional/south, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "dkD" = ( @@ -10956,8 +10956,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "dmU" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/siding/wideplating_new/dark/corner, /turf/open/floor/grass, /area/station/service/hydroponics/garden) @@ -11827,9 +11827,7 @@ /turf/closed/wall/rust, /area/station/security/checkpoint/supply) "dyu" = ( -/obj/structure/flora/grass/jungle{ - icon_state = "bushb1" - }, +/obj/structure/flora/bush/jungle/b, /turf/open/misc/asteroid, /area/space/nearstation) "dyC" = ( @@ -12338,8 +12336,8 @@ }, /area/station/maintenance/fore) "dHg" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/medical/psychology) "dHi" = ( @@ -13056,7 +13054,7 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "dRh" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "dRm" = ( @@ -13455,7 +13453,7 @@ }, /area/station/maintenance/port/greater) "dXI" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "dXN" = ( @@ -13650,9 +13648,9 @@ /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "ear" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/light/directional/east, /mob/living/carbon/human/species/monkey{ name = "mankey" @@ -14259,8 +14257,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "ejQ" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid, /area/space/nearstation) @@ -14463,7 +14461,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "emd" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -15196,8 +15194,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "evD" = ( -/obj/structure/flora/junglebush/large, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/large/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/medical/virology) "evE" = ( @@ -15542,11 +15540,11 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "eAZ" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced{ dir = 8 }, @@ -19877,7 +19875,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "fFH" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/large/style_random, /turf/open/floor/grass, /area/station/medical/psychology) "fFW" = ( @@ -19966,7 +19964,7 @@ /area/station/maintenance/fore) "fIn" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -20058,7 +20056,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "fJq" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /obj/machinery/camera/directional/west{ c_tag = "Genetics Monkey Pen"; name = "science camera"; @@ -20111,8 +20109,8 @@ }, /obj/structure/window/spawner, /obj/structure/window/spawner/north, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/station/service/chapel/dock) "fKf" = ( @@ -20188,9 +20186,9 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "fKJ" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "fKS" = ( @@ -20345,7 +20343,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "fNy" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "fNG" = ( @@ -20456,10 +20454,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) "fOx" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -21229,9 +21227,9 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "fYU" = ( @@ -21632,8 +21630,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) "gfz" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "gfD" = ( @@ -22589,12 +22587,10 @@ /turf/open/floor/iron, /area/station/cargo/office) "gtd" = ( -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "fullgrass_2" }, -/obj/structure/flora/grass/jungle{ - icon_state = "bushc2" - }, +/obj/structure/flora/bush/jungle/c/style_2, /turf/open/misc/asteroid, /area/space/nearstation) "gtq" = ( @@ -25012,7 +25008,7 @@ /area/station/maintenance/starboard/fore) "gZI" = ( /obj/structure/water_source/puddle, -/obj/structure/flora/ausbushes/reedbush{ +/obj/structure/flora/bush/reed/style_random{ pixel_y = 5 }, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -26405,9 +26401,9 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/leavy/style_random, /mob/living/simple_animal/butterfly, /turf/open/floor/grass, /area/station/hallway/primary/fore) @@ -26742,9 +26738,9 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "hyl" = ( @@ -26808,9 +26804,7 @@ /turf/closed/wall/r_wall/rust, /area/station/science/misc_lab) "hzC" = ( -/obj/structure/flora/rock/pile{ - icon_state = "basalt2" - }, +/obj/structure/flora/rock/icy/style_2, /turf/open/misc/asteroid/airless, /area/space/nearstation) "hzE" = ( @@ -27196,11 +27190,11 @@ /turf/open/floor/plating, /area/station/security/execution/education) "hEE" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/station/maintenance/aft) "hEH" = ( @@ -28516,7 +28510,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "hVT" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/chapel/monastery) @@ -28683,7 +28677,7 @@ }, /area/station/engineering/supermatter/room) "hZd" = ( -/obj/structure/flora/tree/jungle, +/obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "hZg" = ( @@ -29878,7 +29872,7 @@ }, /area/station/maintenance/port/lesser) "inw" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/structure/window/reinforced, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -30170,7 +30164,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "iqk" = ( -/obj/structure/flora/rock/pile{ +/obj/structure/flora/rock/pile/style_random{ pixel_x = 4; pixel_y = 3 }, @@ -30422,9 +30416,9 @@ }, /area/station/maintenance/starboard/aft) "itZ" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/medical/psychology) @@ -30810,10 +30804,10 @@ /turf/closed/wall/rust, /area/station/maintenance/port/lesser) "ize" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/newscaster/directional/north, /obj/machinery/light/small/directional/north, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "izf" = ( @@ -32257,10 +32251,10 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "iUM" = ( @@ -32670,8 +32664,8 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/reed/style_random, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" @@ -32820,7 +32814,7 @@ /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/starboard) "jbP" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -32936,7 +32930,7 @@ }, /area/station/maintenance/port/lesser) "jdl" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "jdp" = ( @@ -33086,7 +33080,7 @@ /obj/structure/sign/warning/electric_shock{ pixel_y = -32 }, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -34079,8 +34073,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/office) "juq" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/asteroid, /area/station/hallway/secondary/exit/departure_lounge) "jus" = ( @@ -34773,10 +34767,10 @@ /turf/open/floor/iron/dark, /area/station/service/janitor) "jHo" = ( -/obj/structure/flora/junglebush, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/item/food/grown/banana, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -34899,7 +34893,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "jJh" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/space/nearstation) "jJs" = ( @@ -35462,11 +35456,11 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "jQV" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -35635,7 +35629,7 @@ /turf/open/floor/iron, /area/station/commons/locker) "jTk" = ( -/obj/structure/flora/rock/pile{ +/obj/structure/flora/rock/pile/style_random{ pixel_x = -6; pixel_y = -3 }, @@ -35771,7 +35765,7 @@ /area/station/maintenance/port/fore) "jVZ" = ( /obj/structure/water_source/puddle, -/obj/structure/flora/ausbushes/reedbush{ +/obj/structure/flora/bush/reed/style_random{ pixel_y = 5 }, /turf/open/floor/grass, @@ -36147,8 +36141,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "kbA" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/item/plant_analyzer, /turf/open/floor/grass, /area/station/security/prison) @@ -36731,9 +36725,7 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "kmK" = ( -/obj/structure/flora/rock/pile{ - icon_state = "basalt" - }, +/obj/structure/flora/rock, /turf/open/misc/asteroid/airless, /area/space/nearstation) "kmM" = ( @@ -36966,11 +36958,11 @@ }, /area/station/maintenance/starboard) "kqD" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced{ dir = 4 }, @@ -38209,7 +38201,7 @@ }, /area/station/maintenance/port/lesser) "kLm" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/station/science/genetics) "kLn" = ( @@ -38239,7 +38231,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "kLy" = ( -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "fernybush_3" }, /turf/open/misc/asteroid, @@ -39607,11 +39599,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/crew_quarters/bar) "lcS" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced{ dir = 8 }, @@ -39869,7 +39861,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "lhJ" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/grass, /area/station/science/genetics) @@ -40401,8 +40393,8 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "lqy" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "lqC" = ( @@ -41247,7 +41239,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) "lCC" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "lCV" = ( @@ -41431,8 +41423,8 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) "lEI" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "lFr" = ( @@ -41635,11 +41627,11 @@ /area/station/security/execution/education) "lIE" = ( /obj/structure/cable, -/obj/structure/flora/ausbushes/sparsegrass{ +/obj/structure/flora/bush/sparsegrass/style_random{ pixel_x = 7; pixel_y = 3 }, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/security/prison) "lJd" = ( @@ -42692,8 +42684,8 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/hallway/primary/fore) "lYE" = ( @@ -43488,12 +43480,12 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/hallway/primary/fore) "mjh" = ( @@ -43720,7 +43712,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "mlD" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "mlH" = ( @@ -44175,9 +44167,9 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" @@ -44360,7 +44352,7 @@ /obj/structure/window/spawner, /obj/structure/window/spawner/east, /obj/structure/window/spawner/north, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/service/chapel/dock) "mvW" = ( @@ -44610,15 +44602,13 @@ /turf/open/floor/iron/checker, /area/station/service/hydroponics) "mzt" = ( -/obj/structure/flora/grass/jungle{ +/obj/structure/flora/grass/jungle/a/style_random{ icon_state = "grassb2" }, -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "brflowers_3" }, -/obj/structure/flora/ausbushes/palebush{ - icon_state = "fernybush_1" - }, +/obj/structure/flora/bush/ferny, /turf/open/misc/asteroid, /area/space/nearstation) "mzB" = ( @@ -46345,7 +46335,7 @@ /obj/structure/sign/departments/security{ pixel_y = -32 }, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/directional/south, /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -46670,7 +46660,7 @@ }, /obj/structure/window/spawner, /obj/structure/window/spawner/north, -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/floor/grass, /area/station/service/chapel/dock) "nal" = ( @@ -46722,9 +46712,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "nax" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/hallway/primary/fore) "naC" = ( @@ -47105,9 +47095,9 @@ }, /area/station/engineering/storage/tech) "nfR" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid, /area/space/nearstation) @@ -47173,7 +47163,7 @@ /obj/structure/sign/departments/security{ pixel_y = -32 }, -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/machinery/light/directional/south, /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -47512,7 +47502,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "noO" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47996,7 +47986,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "nuL" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) @@ -48291,10 +48281,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "nzz" = ( @@ -48397,8 +48387,8 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "nBM" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/security/prison) "nBZ" = ( @@ -48455,9 +48445,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "nCA" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/reed/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/light/directional/south, /turf/open/floor/grass, /area/station/hallway/primary/fore) @@ -50117,11 +50107,11 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "oce" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "ocg" = ( @@ -50237,8 +50227,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "odE" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "oeF" = ( @@ -50328,7 +50318,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "ofz" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "ofA" = ( @@ -50349,8 +50339,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "ofB" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/ferny/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/virology) @@ -50733,9 +50723,9 @@ /turf/open/floor/plating, /area/station/security/prison) "olv" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "olz" = ( @@ -51503,9 +51493,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "oxp" = ( -/obj/structure/flora/junglebush, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/machinery/light/directional/west, /turf/open/floor/grass, /area/station/medical/psychology) @@ -51999,10 +51989,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "oEL" = ( @@ -52313,11 +52303,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "oIy" = ( @@ -52432,9 +52422,9 @@ }, /area/station/maintenance/starboard/fore) "oJH" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -52543,9 +52533,9 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /mob/living/simple_animal/butterfly, /turf/open/floor/grass, /area/station/hallway/primary/fore) @@ -52917,7 +52907,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "oSs" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -53177,10 +53167,8 @@ /turf/open/floor/iron/dark, /area/station/science/misc_lab) "oVP" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/rock/pile{ - icon_state = "basalt" - }, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/rock, /turf/open/misc/asteroid, /area/station/hallway/secondary/exit/departure_lounge) "oVY" = ( @@ -53901,9 +53889,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "pgh" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/cable, /turf/open/floor/grass, /area/station/security/prison) @@ -54022,7 +54010,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "phQ" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -54270,9 +54258,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "pkE" = ( @@ -54520,9 +54508,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "poU" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -55399,8 +55387,8 @@ /obj/structure/window/spawner, /obj/structure/window/spawner/west, /obj/structure/window/spawner/north, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/service/chapel/dock) "pBh" = ( @@ -55580,8 +55568,8 @@ /turf/closed/wall/rust, /area/station/maintenance/aft) "pDP" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "pDT" = ( @@ -56444,8 +56432,8 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "pPD" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "pPZ" = ( @@ -57085,10 +57073,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "qai" = ( @@ -57224,9 +57212,9 @@ /turf/open/floor/carpet/red, /area/station/service/chapel/monastery) "qbO" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57676,7 +57664,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "qip" = ( -/obj/structure/flora/junglebush/b, +/obj/structure/flora/bush/jungle/b/style_random, /obj/machinery/airalarm/directional/east, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -58617,7 +58605,7 @@ /turf/open/floor/iron/dark, /area/station/medical/paramedic) "qvq" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) "qvz" = ( @@ -58949,11 +58937,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "qAG" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced{ dir = 4 }, @@ -58993,8 +58981,8 @@ }, /obj/structure/window/spawner, /obj/structure/window/spawner/north, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/service/chapel/dock) "qBR" = ( @@ -59245,7 +59233,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "qFs" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/chapel/monastery) @@ -61173,10 +61161,10 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "rmI" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -61720,7 +61708,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/misc_lab) "rsX" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "rsY" = ( @@ -62382,8 +62370,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "rBS" = ( -/obj/structure/flora/junglebush/b, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/directional/west{ c_tag = "Virology Monkey Pen"; @@ -62904,8 +62892,8 @@ }, /area/station/hallway/primary/port) "rJN" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "rJO" = ( @@ -63081,11 +63069,11 @@ }, /area/ai_monitored/command/nuke_storage) "rLG" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid, /area/space/nearstation) @@ -64070,7 +64058,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "sac" = ( -/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/grass/jungle/b/style_random, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -64726,9 +64714,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/fore) "slh" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /obj/item/radio/intercom/directional/south, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "slo" = ( @@ -64866,10 +64854,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "snh" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/cable, /turf/open/floor/grass, /area/station/security/prison) @@ -65370,7 +65358,7 @@ /turf/open/floor/iron/chapel, /area/station/service/chapel/monastery) "ssU" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/a/style_random, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -68074,9 +68062,7 @@ }, /area/station/maintenance/disposal/incinerator) "tgU" = ( -/obj/structure/flora/rock/pile{ - icon_state = "lavarocks2" - }, +/obj/structure/flora/rock/pile/style_2, /turf/open/misc/asteroid/airless, /area/space/nearstation) "tgZ" = ( @@ -68148,7 +68134,7 @@ }, /area/station/maintenance/port/fore) "thK" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/effect/decal/cleanable/blood/old, /obj/structure/cable, /turf/open/floor/grass, @@ -68328,9 +68314,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "tlA" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/asteroid, /area/station/hallway/secondary/exit/departure_lounge) "tlJ" = ( @@ -68772,7 +68758,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "tre" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -69181,7 +69167,7 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "tyA" = ( -/obj/structure/flora/junglebush/c, +/obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, /area/station/medical/psychology) "tyD" = ( @@ -70233,7 +70219,7 @@ /obj/structure/sign/warning/electric_shock{ pixel_y = -32 }, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -71017,7 +71003,7 @@ /turf/closed/wall/rust, /area/station/maintenance/port/lesser) "tZX" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) "uan" = ( @@ -71428,8 +71414,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "ugc" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -71532,7 +71518,7 @@ /turf/open/floor/wood, /area/station/commons/locker) "uiu" = ( -/obj/structure/flora/junglebush/b, +/obj/structure/flora/bush/jungle/b/style_random, /turf/open/floor/grass, /area/station/medical/psychology) "uiE" = ( @@ -71559,9 +71545,7 @@ /turf/open/floor/wood, /area/station/maintenance/port/fore) "uiX" = ( -/obj/structure/flora/rock/pile{ - icon_state = "basalt" - }, +/obj/structure/flora/rock, /turf/open/misc/asteroid, /area/space/nearstation) "ujh" = ( @@ -74006,7 +73990,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "uWQ" = ( -/obj/structure/flora/rock/pile{ +/obj/structure/flora/rock/pile/style_random{ pixel_x = -6; pixel_y = -3 }, @@ -74542,12 +74526,10 @@ }, /area/station/maintenance/fore) "vdK" = ( -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "fullgrass_2" }, -/obj/structure/flora/grass/jungle{ - icon_state = "grassb5" - }, +/obj/structure/flora/grass/jungle/b/style_5, /turf/open/misc/asteroid, /area/space/nearstation) "vdS" = ( @@ -75197,7 +75179,7 @@ /area/station/maintenance/port/fore) "vnH" = ( /obj/item/radio/intercom/directional/west, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/science/genetics) @@ -75422,7 +75404,7 @@ /turf/closed/wall/r_wall, /area/station/tcommsat/computer) "vqJ" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /obj/structure/sign/warning/electric_shock{ pixel_y = -32 }, @@ -75434,8 +75416,8 @@ /area/station/engineering/storage/tech) "vrd" = ( /obj/machinery/firealarm/directional/north, -/obj/structure/flora/ausbushes/pointybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "vrf" = ( @@ -75552,8 +75534,8 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "vsJ" = ( -/obj/structure/flora/junglebush/b, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/station/medical/psychology) "vsR" = ( @@ -76591,9 +76573,9 @@ /turf/closed/wall, /area/station/science/lab) "vGs" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "vGt" = ( @@ -77368,11 +77350,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "vPF" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/leavy/style_random, /obj/structure/cable, /turf/open/floor/grass, /area/station/security/prison) @@ -77918,10 +77900,10 @@ /turf/closed/wall/r_wall/rust, /area/station/engineering/storage/tech) "vVX" = ( -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "fullgrass_2" }, -/obj/structure/flora/ausbushes/palebush{ +/obj/structure/flora/bush/pale/style_random{ icon_state = "genericbush_1" }, /turf/open/misc/asteroid, @@ -78167,7 +78149,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "vZn" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "vZu" = ( @@ -78897,9 +78879,9 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "wjK" = ( @@ -79518,10 +79500,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) "wqu" = ( -/obj/structure/flora/rock/pile{ - icon_state = "basalt" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rock, /turf/open/misc/asteroid, /area/space/nearstation) "wqx" = ( @@ -79823,7 +79803,7 @@ /area/station/engineering/atmos) "wuP" = ( /obj/structure/water_source/puddle, -/obj/structure/flora/ausbushes/reedbush{ +/obj/structure/flora/bush/reed/style_random{ pixel_y = 5 }, /turf/open/floor/grass, @@ -80390,7 +80370,7 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "wDI" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) "wEj" = ( @@ -81480,9 +81460,9 @@ }, /area/station/maintenance/port/greater) "wQK" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/station/hallway/primary/central) "wQN" = ( @@ -82302,7 +82282,7 @@ /turf/open/floor/iron/dark, /area/station/service/library) "xcR" = ( -/obj/structure/flora/grass/jungle{ +/obj/structure/flora/grass/jungle/a/style_random{ icon_state = "bushc2" }, /turf/open/misc/asteroid, @@ -82450,9 +82430,9 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "xfZ" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/airalarm/directional/west, /turf/open/floor/grass, /area/station/medical/psychology) @@ -82873,7 +82853,7 @@ }, /area/station/engineering/supermatter) "xlF" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/chapel/monastery) "xlL" = ( @@ -82930,8 +82910,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "xmI" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/medical/psychology) @@ -83083,9 +83063,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "xoK" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/station/medical/virology) "xoO" = ( @@ -83511,10 +83491,10 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "xvj" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) "xvr" = ( @@ -84226,8 +84206,8 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "xFt" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/grass/jungle/a/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/disposalpipe/segment{ dir = 10 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cbc0d54e551..06771bd7f8f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -992,9 +992,9 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "asW" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /obj/machinery/camera/directional/east{ c_tag = "Science Ordnance Office"; network = list("ss13","rd") @@ -4173,7 +4173,7 @@ }, /area/station/command/gateway) "buN" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/large/style_random, /obj/structure/disposalpipe/segment, /turf/open/floor/grass, /area/station/medical/treatment_center) @@ -4805,10 +4805,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) "bJW" = ( @@ -9401,7 +9401,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "dwl" = ( -/obj/structure/flora/junglebush/c, +/obj/structure/flora/bush/jungle/c/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/medical/virology) @@ -11742,9 +11742,9 @@ /turf/open/floor/iron/white, /area/station/science/research) "emz" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /obj/item/radio/intercom/directional/east, /turf/open/floor/grass, /area/station/science/mixing/hallway) @@ -15696,8 +15696,8 @@ /turf/open/floor/iron/dark, /area/station/security/range) "fOS" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/item/food/grown/banana, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -16470,7 +16470,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "geE" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/medical/virology) @@ -18853,7 +18853,7 @@ /turf/open/floor/wood, /area/station/commons/lounge) "gXl" = ( -/obj/structure/flora/rock/jungle, +/obj/structure/flora/rock/pile/jungle/style_random, /turf/open/floor/grass, /area/station/medical/virology) "gXo" = ( @@ -25694,7 +25694,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "jjC" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/item/food/grown/banana, /turf/open/floor/grass, /area/station/medical/virology) @@ -26814,7 +26814,7 @@ /area/station/commons/locker) "jBF" = ( /obj/structure/water_source/puddle, -/obj/structure/flora/junglebush/large{ +/obj/structure/flora/bush/large/style_random{ pixel_y = 0 }, /obj/structure/cable, @@ -31388,10 +31388,10 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "lhU" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) @@ -32253,7 +32253,7 @@ }, /area/station/maintenance/aft/lesser) "lwx" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /obj/machinery/camera/directional/north{ c_tag = "Virology Test Subject Chamber"; network = list("ss13","medbay") @@ -38581,8 +38581,8 @@ /area/station/medical/medbay/central) "nMj" = ( /obj/structure/window/fulltile, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "nMz" = ( @@ -38638,7 +38638,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/stalky/style_random, /turf/open/floor/grass, /area/station/science/research) "nNw" = ( @@ -39868,7 +39868,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/science/research) "ojt" = ( @@ -40562,9 +40562,9 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "ovQ" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/science/mixing/hallway) @@ -44334,8 +44334,8 @@ /area/station/maintenance/port/aft) "pPN" = ( /obj/structure/window/fulltile, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/maintenance/starboard/aft) "pQj" = ( @@ -50570,10 +50570,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) "rTg" = ( @@ -51852,10 +51852,10 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) "sqb" = ( @@ -53997,7 +53997,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "taW" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/station/medical/virology) "taX" = ( @@ -55490,7 +55490,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) "tAT" = ( @@ -56859,8 +56859,8 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) "tZS" = ( -/obj/structure/flora/junglebush/b, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/medical/virology) @@ -60130,7 +60130,7 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "vip" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/airalarm/directional/north, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -65369,10 +65369,10 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "wXk" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) @@ -67627,7 +67627,7 @@ /turf/open/floor/plating, /area/station/cargo/sorting) "xNi" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/cable, /turf/open/floor/grass, /area/station/medical/virology) @@ -67948,10 +67948,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) "xTs" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 23b14162024..ba9abd23075 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -123,8 +123,8 @@ /turf/open/floor/mineral/plastitanium, /area/syndicate_mothership/control) "az" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/centcom/holding) "aA" = ( @@ -279,7 +279,7 @@ /turf/open/floor/iron/smooth, /area/syndicate_mothership/control) "aU" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/basalt/wasteland{ initial_gas_mix = "TEMP=2.7" }, @@ -366,7 +366,7 @@ }, /area/tdome/observation) "bh" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -457,7 +457,7 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "bw" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/centcom/holding) "bx" = ( @@ -466,8 +466,8 @@ }, /area/tdome/observation) "by" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "bz" = ( @@ -568,11 +568,11 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "bM" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/tdome/administration) "bN" = ( @@ -660,15 +660,15 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/syndicate_mothership) "bZ" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "ca" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/directional/west, /turf/open/misc/asteroid, /area/tdome/administration) @@ -803,7 +803,7 @@ /turf/open/floor/iron, /area/centcom/courtroom) "cu" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -1174,7 +1174,7 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "dv" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/holding) "dw" = ( @@ -1544,8 +1544,8 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "ex" = ( @@ -1620,9 +1620,9 @@ /turf/open/floor/mineral/titanium, /area/syndicate_mothership/control) "eH" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ icon_state = "asteroid5"; name = "plating" @@ -1642,11 +1642,11 @@ /turf/open/floor/wood/large, /area/centcom/holding) "eK" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/directional/south, /turf/open/misc/asteroid, /area/centcom/evacuation) @@ -2084,12 +2084,12 @@ /turf/open/space/basic, /area/space) "ga" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /obj/machinery/light/directional/south, /turf/open/floor/grass, /area/tdome/administration) @@ -2124,8 +2124,8 @@ /turf/open/floor/sepia, /area/centcom/holding) "gf" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "gh" = ( @@ -2250,7 +2250,7 @@ /turf/open/floor/iron/white, /area/tdome/observation) "gz" = ( -/obj/structure/flora/rock/icy{ +/obj/structure/flora/rock/icy/style_random{ pixel_x = -7 }, /obj/effect/light_emitter{ @@ -2414,7 +2414,7 @@ /turf/open/floor/iron, /area/centcom/armory) "gZ" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/holding) "hb" = ( @@ -2503,11 +2503,11 @@ /turf/open/lava/plasma/ice_moon, /area/syndicate_mothership/control) "hm" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/directional/north, /turf/open/misc/asteroid, /area/centcom/evacuation) @@ -2686,9 +2686,9 @@ /turf/open/floor/iron/dark, /area/centcom/control) "hG" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -2779,7 +2779,7 @@ /turf/open/floor/catwalk_floor, /area/centcom/holding) "hS" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "hT" = ( @@ -3001,8 +3001,8 @@ /turf/open/floor/iron, /area/centcom/prison) "iA" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -4144,9 +4144,9 @@ /turf/open/floor/iron, /area/centcom/fore) "lN" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -4542,11 +4542,11 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/syndicate_mothership/control) "mQ" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/centcom/control) "mR" = ( @@ -4749,8 +4749,8 @@ /turf/open/floor/carpet, /area/syndicate_mothership/control) "nu" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/rock/pile, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "nw" = ( @@ -5278,8 +5278,8 @@ }, /area/syndicate_mothership/control) "oT" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -5486,7 +5486,7 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "py" = ( @@ -5584,11 +5584,11 @@ /turf/open/floor/iron, /area/tdome/observation) "pO" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/tdome/observation) "pQ" = ( @@ -5829,9 +5829,9 @@ /turf/open/floor/mineral/titanium, /area/syndicate_mothership/control) "qw" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ icon_state = "asteroid5"; name = "plating" @@ -5846,47 +5846,47 @@ /turf/open/floor/plating/snowed/icemoon, /area/syndicate_mothership/control) "qy" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qz" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qA" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evacuation) "qB" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qC" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evacuation) "qD" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qE" = ( @@ -5961,8 +5961,8 @@ /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "qW" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qX" = ( @@ -5970,8 +5970,8 @@ /turf/open/floor/grass, /area/centcom/evacuation) "qY" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/evacuation) "qZ" = ( @@ -6123,9 +6123,9 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/syndicate_mothership/expansion_bombthreat) "rF" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -6138,9 +6138,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/syndicate_mothership/expansion_bioterrorism) "rH" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/machinery/light/directional/east, /turf/open/floor/iron{ icon_state = "asteroid5"; @@ -6156,21 +6156,21 @@ /turf/open/floor/iron, /area/centcom/fore) "rJ" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /obj/machinery/light/directional/west, /turf/open/floor/grass, /area/centcom/fore) "rK" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/centcom/control) "rM" = ( @@ -6218,20 +6218,20 @@ /turf/open/floor/iron, /area/centcom/prison) "rT" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced, /turf/open/floor/grass, /area/centcom/evacuation) "rU" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced, /turf/open/floor/grass, /area/centcom/evacuation) "rV" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced, /turf/open/floor/grass, /area/centcom/evacuation) @@ -6387,8 +6387,8 @@ /turf/open/floor/iron, /area/tdome/observation) "sD" = ( -/obj/structure/flora/rock/pile, -/obj/structure/flora/grass/both, +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "sE" = ( @@ -6888,11 +6888,11 @@ /turf/open/floor/iron/grimy, /area/centcom/admin) "uj" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/centcom/prison) "uk" = ( @@ -7113,37 +7113,37 @@ /turf/open/floor/iron/white, /area/tdome/observation) "uY" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/centcom/ferry) "uZ" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/centcom/ferry) "va" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/centcom/ferry) "vb" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/centcom/ferry) "vc" = ( @@ -7247,7 +7247,7 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "vq" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "vr" = ( @@ -7537,12 +7537,12 @@ /turf/open/floor/mineral/plastitanium, /area/syndicate_mothership/control) "wj" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/tdome/administration) "wk" = ( @@ -8050,7 +8050,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "xE" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "xF" = ( @@ -8241,7 +8241,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "yq" = ( -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "yr" = ( @@ -8635,11 +8635,11 @@ /turf/open/floor/iron/dark, /area/centcom/briefing) "zA" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/tdome/administration) "zB" = ( @@ -8650,11 +8650,11 @@ /turf/open/floor/iron/smooth, /area/syndicate_mothership/control) "zC" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/control) "zD" = ( @@ -8739,8 +8739,8 @@ /turf/open/floor/iron/white, /area/centcom/control) "zL" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/rock/icy, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "zM" = ( @@ -8924,7 +8924,7 @@ /turf/open/floor/iron/dark, /area/centcom/courtroom) "Aj" = ( -/obj/structure/flora/rock/jungle{ +/obj/structure/flora/rock/pile/jungle/style_random{ pixel_x = -12; pixel_y = 15 }, @@ -9337,7 +9337,7 @@ /turf/open/floor/iron, /area/tdome/observation) "Bt" = ( -/obj/structure/flora/rock/icy{ +/obj/structure/flora/rock/icy/style_random{ pixel_x = -7 }, /turf/open/misc/asteroid/snow/airless, @@ -9631,11 +9631,11 @@ }, /area/syndicate_mothership/control) "Cd" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /obj/machinery/light/directional/south, /turf/open/floor/grass, /area/centcom/evacuation) @@ -9752,11 +9752,11 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "Cr" = ( -/obj/structure/flora/rock/pile/largejungle, +/obj/structure/flora/rock/pile/jungle/large/style_random, /turf/open/misc/beach/sand, /area/centcom/holding) "Cs" = ( @@ -9772,14 +9772,14 @@ /turf/open/floor/carpet, /area/syndicate_mothership/control) "Cu" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /obj/structure/railing, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "Cv" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -9959,7 +9959,7 @@ /turf/open/misc/sandy_dirt, /area/centcom/holding) "CX" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/structure/railing{ dir = 1 }, @@ -10060,8 +10060,8 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "Dp" = ( @@ -10574,7 +10574,7 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/syndicate_mothership/expansion_chemicalwarfare) "EP" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -10971,8 +10971,8 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "FT" = ( @@ -11164,8 +11164,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/syndicate_mothership/expansion_bioterrorism) "Gv" = ( -/obj/structure/flora/rock/pile, -/obj/structure/flora/grass/both, +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "Gw" = ( @@ -11247,8 +11247,8 @@ /turf/open/floor/iron, /area/centcom/prison) "GD" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "GE" = ( @@ -11387,9 +11387,9 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/syndicate_mothership/expansion_bombthreat) "Hi" = ( -/obj/structure/flora/rock/pile, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/railing{ dir = 8 }, @@ -11427,9 +11427,9 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/syndicate_mothership/expansion_bombthreat) "Hm" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ icon_state = "asteroid5"; name = "plating" @@ -11504,11 +11504,11 @@ /turf/open/misc/ice/icemoon, /area/syndicate_mothership/control) "HE" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/tdome/observation) "HF" = ( @@ -11572,7 +11572,7 @@ /turf/open/floor/mineral/titanium, /area/syndicate_mothership/control) "HQ" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "HS" = ( @@ -11739,7 +11739,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/syndicate_mothership/expansion_bioterrorism) "In" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /obj/structure/railing{ dir = 1 }, @@ -12256,7 +12256,7 @@ /turf/open/floor/mineral/titanium, /area/syndicate_mothership/control) "JT" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "JU" = ( @@ -12352,7 +12352,7 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "Ki" = ( @@ -12564,7 +12564,7 @@ /turf/closed/wall/mineral/titanium/interior, /area/centcom/evacuation/ship) "KT" = ( -/obj/structure/flora/rock/pile/largejungle{ +/obj/structure/flora/rock/pile/jungle/large/style_random{ pixel_y = -3 }, /turf/open/misc/ashplanet/wateryrock{ @@ -13177,7 +13177,7 @@ /turf/open/floor/iron/white, /area/tdome/observation) "MT" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -13795,7 +13795,7 @@ /turf/open/floor/iron/cafeteria, /area/centcom/holding) "OC" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/basalt/wasteland{ initial_gas_mix = "TEMP=2.7" }, @@ -13810,9 +13810,9 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "OE" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -13987,7 +13987,7 @@ /turf/open/floor/iron/dark, /area/tdome/observation) "Pd" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "Pe" = ( @@ -14030,7 +14030,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "Ph" = ( -/obj/structure/flora/rock/icy{ +/obj/structure/flora/rock/icy/style_random{ pixel_x = -7 }, /turf/open/misc/asteroid/snow/icemoon, @@ -14233,11 +14233,11 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/one) "PL" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/evacuation) "PM" = ( @@ -14464,8 +14464,8 @@ /turf/open/floor/iron/dark, /area/centcom/prison) "Qs" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/grass/both, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "Qu" = ( @@ -14567,9 +14567,9 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "QL" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pale/style_random, /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/centcom/holding) @@ -14657,7 +14657,7 @@ /turf/open/floor/iron/grimy, /area/centcom/admin) "QW" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -15332,9 +15332,9 @@ /turf/open/floor/iron, /area/centcom/armory) "SU" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/machinery/light/directional/east, /turf/open/floor/iron{ dir = 6; @@ -15639,8 +15639,8 @@ /turf/open/floor/iron/grimy, /area/centcom/briefing) "TF" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/holding) "TG" = ( @@ -15867,17 +15867,17 @@ /turf/open/floor/mineral/plastitanium, /area/syndicate_mothership/expansion_chemicalwarfare) "Ul" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/fore) "Um" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -15935,8 +15935,8 @@ /turf/open/floor/sepia, /area/centcom/holding) "Uq" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/tree/dead, +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/syndicate_mothership/control) "Ur" = ( @@ -16244,7 +16244,7 @@ /turf/open/floor/stone, /area/syndicate_mothership/control) "Vf" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/ironsand{ color = "#525252"; initial_gas_mix = "TEMP=2.7" @@ -16295,11 +16295,11 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/two) "Vl" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/tdome/administration) "Vm" = ( @@ -16369,7 +16369,7 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/rock/icy, +/obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "Vw" = ( @@ -16866,7 +16866,7 @@ /turf/open/floor/iron/dark, /area/tdome/observation) "WJ" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "WK" = ( @@ -16982,7 +16982,7 @@ set_cap = 1; set_luminosity = 4 }, -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "WW" = ( @@ -17039,12 +17039,12 @@ /turf/open/floor/mineral/plastitanium/red, /area/syndicate_mothership/expansion_bioterrorism) "Xf" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/tdome/observation) "Xg" = ( @@ -17295,11 +17295,11 @@ /turf/open/floor/sepia, /area/centcom/holding) "XJ" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/tdome/observation) "XK" = ( @@ -17445,15 +17445,15 @@ }, /area/syndicate_mothership/control) "Yl" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/airless, /area/syndicate_mothership) "Ym" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/control) "Yn" = ( @@ -17722,7 +17722,7 @@ /turf/open/floor/plating, /area/syndicate_mothership/control) "Zc" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/basalt/airless, /area/centcom/holding) "Zd" = ( @@ -17878,7 +17878,7 @@ /turf/open/floor/wood/parquet, /area/centcom/holding) "Zu" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/holding) diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_engine_east_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_engine_east_2.dmm index 49659fd96fa..40f62e02d47 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_engine_east_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_engine_east_2.dmm @@ -88,7 +88,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "V" = ( -/obj/structure/flora/tree/pine{ +/obj/structure/flora/tree/pine/style_random{ desc = "A coniferous pine tree. How the hell did they manage to fit this in here?" }, /obj/item/food/deadmouse{ diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 41a057342a4..7068853c10a 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2157,7 +2157,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) "aVp" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/science/genetics) @@ -7830,7 +7830,7 @@ /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) "cHn" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/medical/virology) "cHz" = ( @@ -9301,7 +9301,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/station/medical/virology) @@ -10459,8 +10459,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/commons/dorms) "dww" = ( @@ -10623,7 +10623,7 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/left) "dyl" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/station/medical/virology) "dyq" = ( @@ -13439,7 +13439,7 @@ /turf/open/floor/iron, /area/station/cargo/miningdock) "eyX" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /mob/living/carbon/human/species/monkey, @@ -15431,7 +15431,7 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "fkU" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/science/genetics) @@ -15651,8 +15651,8 @@ /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/center) "fpf" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/tree/palm, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/tree/palm/style_random, /turf/open/floor/grass, /area/station/medical/virology) "fpg" = ( @@ -23037,7 +23037,7 @@ /turf/open/floor/iron, /area/station/command/gateway) "hSI" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/door/window/left/directional/west{ name = "Monkey Pen"; req_access_txt = "9" @@ -23174,8 +23174,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/commons/dorms) "hVg" = ( @@ -28559,8 +28559,8 @@ /turf/open/floor/iron/freezer, /area/station/security/prison) "jLF" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/tree/palm, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/tree/palm/style_random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/grass, /area/station/science/genetics) @@ -30299,7 +30299,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "knw" = ( -/obj/structure/flora/tree/palm, +/obj/structure/flora/tree/palm/style_random, /turf/open/floor/grass, /area/station/medical/virology) "knJ" = ( @@ -42449,7 +42449,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/science) "ooR" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /obj/item/food/grown/banana, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/grass, @@ -42577,8 +42577,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/commons/dorms) "oqY" = ( @@ -52804,7 +52804,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/medical/virology) "rOZ" = ( @@ -54868,8 +54868,8 @@ /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) "sCO" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/leavy/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/virology) @@ -57336,7 +57336,7 @@ /turf/open/floor/iron, /area/station/cargo/miningdock) "tuv" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/science/genetics) "tuA" = ( @@ -57635,8 +57635,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/commons/dorms) "tzP" = ( @@ -59781,8 +59781,8 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "umQ" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/tree/palm, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/tree/palm/style_random, /turf/open/floor/grass, /area/station/science/genetics) "umS" = ( @@ -63333,7 +63333,7 @@ /area/station/cargo/miningdock/oresilo) "vvA" = ( /obj/machinery/light/directional/east, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/medical/virology) "vvC" = ( @@ -63931,7 +63931,7 @@ /turf/open/floor/engine/n2o, /area/station/engineering/atmos) "vFV" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced/spawner/west, /turf/open/floor/grass, /area/station/science/genetics) @@ -65101,7 +65101,7 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "wdi" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/medical/virology) "wdj" = ( @@ -69489,7 +69489,7 @@ /turf/open/floor/plating, /area/station/security/processing) "xGA" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/spawner/west, /turf/open/floor/grass, /area/station/science/genetics) diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 765bd99ae61..5f059039534 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -233,18 +233,18 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/arrival) "x" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/arrival) "y" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/arrival) diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm index 6a01b3bf745..c83fc393165 100644 --- a/_maps/shuttles/arrival_kilo.dmm +++ b/_maps/shuttles/arrival_kilo.dmm @@ -226,10 +226,10 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/arrival) "z" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/arrival) diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 64de44e59da..c9fd179424f 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -292,10 +292,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "ax" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) @@ -354,10 +354,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "aI" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/generic/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) @@ -465,10 +465,10 @@ /turf/open/floor/plating, /area/shuttle/escape) "aX" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) @@ -514,10 +514,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "be" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index 26fbd5bff2e..5bd041876cd 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -940,18 +940,18 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bO" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/leavy/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) "bP" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 6f5b2ab20b2..ba60e07674f 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ai" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "aB" = ( @@ -25,7 +25,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "be" = ( -/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/bush/stalky/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "bo" = ( @@ -329,7 +329,7 @@ /turf/open/floor/stone, /area/shuttle/escape/simulation) "mG" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /obj/effect/decal/remains/human, /turf/open/misc/grass, /area/shuttle/escape/simulation) @@ -553,7 +553,7 @@ /turf/open/floor/plating, /area/shuttle/escape/simulation) "yk" = ( -/obj/structure/flora/ausbushes, +/obj/structure/flora/bush, /turf/open/misc/grass, /area/shuttle/escape/simulation) "zd" = ( @@ -624,7 +624,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "BP" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "Ck" = ( @@ -692,7 +692,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "Dn" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "En" = ( @@ -830,7 +830,7 @@ /turf/open/floor/circuit/green/anim, /area/shuttle/escape) "Gy" = ( -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/generic/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "Ho" = ( @@ -858,11 +858,11 @@ /turf/closed/indestructible/iron, /area/shuttle/escape/simulation) "IS" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "Je" = ( -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "JC" = ( @@ -878,7 +878,7 @@ /turf/open/floor/glass, /area/shuttle/escape) "JF" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "JU" = ( @@ -930,7 +930,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "KK" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "LA" = ( @@ -953,12 +953,12 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "MD" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /obj/effect/decal/remains/human, /turf/open/misc/grass, /area/shuttle/escape/simulation) "MX" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "Nm" = ( @@ -1141,7 +1141,7 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "TK" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/grass, /area/shuttle/escape/simulation) "TZ" = ( diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 35b87c98441..8fc0e63f67b 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -309,9 +309,9 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "eu" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/light/small/directional/south, /obj/machinery/airalarm/directional/south, /turf/open/floor/grass, @@ -456,7 +456,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "gO" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/misc/asteroid, /area/shuttle/escape) "gW" = ( @@ -517,8 +517,8 @@ /turf/open/space/basic, /area/shuttle/escape) "hW" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/reed/style_random, /obj/machinery/camera/directional/south{ c_tag = "Monastery Asteroid Primary Entrance"; network = list("ss13","monastery") @@ -569,8 +569,8 @@ /turf/closed/mineral, /area/shuttle/escape) "it" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "iw" = ( @@ -734,7 +734,7 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "ka" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /obj/machinery/camera/directional/south{ c_tag = "Monastery Asteroid Starboard Aft"; network = list("ss13","monastery") @@ -1717,7 +1717,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "yC" = ( -/obj/structure/flora/ausbushes, +/obj/structure/flora/bush, /obj/effect/turf_decal/sand, /turf/open/floor/iron, /area/shuttle/escape) @@ -1809,8 +1809,8 @@ /turf/open/floor/plating, /area/shuttle/escape) "zB" = ( -/obj/structure/flora/ausbushes/pointybush, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "zE" = ( @@ -1842,8 +1842,8 @@ /turf/open/floor/iron/grimy, /area/shuttle/escape) "zX" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Ab" = ( @@ -1918,7 +1918,7 @@ /turf/open/misc/asteroid, /area/shuttle/escape) "AM" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/shuttle/escape) "AW" = ( @@ -1946,8 +1946,8 @@ /turf/open/floor/carpet, /area/shuttle/escape) "Bp" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/beebox, /obj/item/queen_bee/bought, /turf/open/floor/grass, @@ -2066,8 +2066,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "CN" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/shuttle/escape) "CR" = ( @@ -2079,7 +2079,7 @@ "Dc" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/light/small/directional/west, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/cable, /turf/open/floor/grass, /area/shuttle/escape) @@ -2113,7 +2113,7 @@ /turf/open/floor/iron/chapel, /area/shuttle/escape) "Dt" = ( -/obj/structure/flora/ausbushes, +/obj/structure/flora/bush, /turf/open/misc/asteroid, /area/shuttle/escape) "Dv" = ( @@ -2180,7 +2180,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "En" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Ep" = ( @@ -2227,9 +2227,9 @@ /turf/open/floor/grass, /area/shuttle/escape) "ET" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "EU" = ( @@ -2245,7 +2245,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Ff" = ( -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/generic/style_random, /obj/machinery/light/small/directional/east, /turf/open/floor/grass, /area/shuttle/escape) @@ -2307,8 +2307,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "FK" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/shuttle/escape) "FO" = ( @@ -2379,13 +2379,13 @@ /turf/open/misc/asteroid, /area/shuttle/escape) "GN" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/shuttle/escape) "GU" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Hc" = ( @@ -2432,8 +2432,8 @@ /turf/open/floor/grass, /area/shuttle/escape) "HS" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Ig" = ( @@ -2511,9 +2511,9 @@ /turf/open/space/basic, /area/shuttle/escape) "IR" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pale/style_random, /turf/open/floor/grass, /area/shuttle/escape) "IT" = ( @@ -2573,8 +2573,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Jv" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/camera/directional/north{ c_tag = "Monastery Garden"; network = list("ss13","monastery") @@ -2674,8 +2674,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Kn" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/bush/reed/style_random, /turf/open/misc/asteroid, /area/shuttle/escape) "KE" = ( @@ -3034,7 +3034,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "Pe" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/shuttle/escape) "Pp" = ( @@ -3247,9 +3247,9 @@ /turf/open/floor/plating, /area/shuttle/escape) "Rz" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/light/small/directional/north, /turf/open/floor/grass, /area/shuttle/escape) @@ -3707,7 +3707,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Wl" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Wo" = ( @@ -3781,7 +3781,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Xm" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Xs" = ( @@ -3904,8 +3904,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "YD" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/shuttle/escape) "YE" = ( diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index 99666abd37e..ca7dff35fec 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "as" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "au" = ( @@ -9,7 +9,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "ay" = ( -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "aA" = ( @@ -22,12 +22,12 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "aJ" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/stalky/style_random, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "bd" = ( -/obj/structure/flora/rock/pile/largejungle, +/obj/structure/flora/rock/pile/jungle/large/style_random, /turf/open/floor/grass, /area/shuttle/escape) "bg" = ( @@ -126,7 +126,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 6 }, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "eB" = ( @@ -166,8 +166,8 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "fG" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/shuttle/escape) "fJ" = ( @@ -201,7 +201,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "gl" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/flora/bush/large/style_random, /turf/open/floor/grass, /area/shuttle/escape) "gu" = ( @@ -268,12 +268,12 @@ /obj/effect/turf_decal/weather/dirt{ dir = 4 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "it" = ( /mob/living/carbon/human/species/monkey, -/obj/structure/flora/grass/jungle/b{ +/obj/structure/flora/grass/jungle/b/style_random{ icon_state = "bushb3" }, /turf/open/floor/grass, @@ -293,7 +293,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/shuttle/escape) "iO" = ( @@ -356,7 +356,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "lH" = ( @@ -421,7 +421,7 @@ "mq" = ( /mob/living/carbon/human/species/monkey, /obj/machinery/light/floor, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "mw" = ( @@ -438,7 +438,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "nD" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "nQ" = ( @@ -478,7 +478,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "qD" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "rg" = ( @@ -558,7 +558,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 10 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "ur" = ( @@ -573,9 +573,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "uI" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock3" - }, +/obj/structure/flora/rock/pile/jungle/style_3, /turf/open/floor/grass, /area/shuttle/escape) "vt" = ( @@ -629,7 +627,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "xZ" = ( @@ -673,7 +671,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "zf" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "zr" = ( @@ -684,7 +682,7 @@ /area/shuttle/escape) "zs" = ( /obj/machinery/light/floor, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "zD" = ( @@ -717,7 +715,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "AM" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Bm" = ( @@ -728,11 +726,11 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Bo" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Bt" = ( -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Bv" = ( @@ -766,13 +764,11 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "BM" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Cb" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "bushc2" - }, +/obj/structure/flora/bush/jungle/c/style_2, /turf/open/floor/grass, /area/shuttle/escape) "Co" = ( @@ -791,7 +787,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "CE" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/shuttle/escape) "CQ" = ( @@ -843,7 +839,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "Fp" = ( -/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Gf" = ( @@ -892,7 +888,7 @@ }, /area/shuttle/escape) "Hq" = ( -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/floor/grass, /area/shuttle/escape) "HV" = ( @@ -903,7 +899,7 @@ /area/shuttle/escape) "Ia" = ( /mob/living/carbon/human/species/monkey, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Io" = ( @@ -966,7 +962,7 @@ /area/shuttle/escape) "Ka" = ( /obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Kv" = ( @@ -997,7 +993,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "LG" = ( @@ -1008,9 +1004,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "LO" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "grassa4" - }, +/obj/structure/flora/grass/jungle/a/style_4, /turf/open/floor/grass, /area/shuttle/escape) "LW" = ( @@ -1030,7 +1024,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 4 }, -/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "MS" = ( @@ -1060,7 +1054,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "Ps" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/shuttle/escape) "PG" = ( @@ -1073,11 +1067,11 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "PP" = ( -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/shuttle/escape) "QC" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "QM" = ( @@ -1152,9 +1146,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "Ti" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "busha3" - }, +/obj/structure/flora/bush/jungle/a/style_3, /turf/open/floor/grass, /area/shuttle/escape) "Ts" = ( @@ -1181,7 +1173,7 @@ /area/shuttle/escape) "TT" = ( /obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Um" = ( @@ -1229,7 +1221,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "VM" = ( -/obj/structure/flora/tree/jungle, +/obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, /area/shuttle/escape) "VU" = ( @@ -1245,7 +1237,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 9 }, -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Wz" = ( @@ -1258,15 +1250,15 @@ /turf/template_noop, /area/template_noop) "WH" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "WL" = ( /turf/open/floor/iron/dark, /area/shuttle/escape) "Xm" = ( -/obj/structure/flora/rock, +/obj/structure/flora/rock/style_random, /turf/open/floor/grass, /area/shuttle/escape) "XK" = ( @@ -1285,7 +1277,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/obj/structure/flora/rock/pile, +/obj/structure/flora/rock/pile/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Yp" = ( @@ -1302,7 +1294,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 9 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/shuttle/escape) "YP" = ( @@ -1348,7 +1340,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 10 }, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/shuttle/escape) "Zt" = ( diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index a87935afe99..debe4eadd70 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -108,10 +108,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "aG" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sunny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) @@ -196,10 +196,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "aI" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/ferny/style_random, /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/shuttle/escape) @@ -231,11 +231,11 @@ /turf/open/floor/iron, /area/shuttle/escape) "aO" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/shuttle/escape) "aP" = ( diff --git a/_maps/templates/holodeck_beach.dmm b/_maps/templates/holodeck_beach.dmm index f410142ea64..e508bab68df 100644 --- a/_maps/templates/holodeck_beach.dmm +++ b/_maps/templates/holodeck_beach.dmm @@ -55,7 +55,7 @@ /turf/open/floor/holofloor/beach, /area/template_noop) "W" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/holofloor/beach, /area/template_noop) "X" = ( diff --git a/_maps/templates/holodeck_petpark.dmm b/_maps/templates/holodeck_petpark.dmm index 19f0c95de1b..f1bc336f02d 100644 --- a/_maps/templates/holodeck_petpark.dmm +++ b/_maps/templates/holodeck_petpark.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "b" = ( -/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/bush/ferny/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "c" = ( @@ -12,7 +12,7 @@ /turf/open/floor/holofloor/grass, /area/template_noop) "f" = ( -/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/bush/generic/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "g" = ( @@ -20,15 +20,15 @@ /turf/open/floor/holofloor/grass, /area/template_noop) "k" = ( -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "l" = ( -/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "p" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /obj/effect/holodeck_effect/mobspawner/pet, /turf/open/floor/holofloor/grass, /area/template_noop) @@ -38,40 +38,40 @@ /turf/open/floor/holofloor/grass, /area/template_noop) "v" = ( -/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/bush/pale/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "w" = ( /obj/effect/holodeck_effect/mobspawner/pet, -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "y" = ( -/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/bush/pointy/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "C" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "D" = ( -/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/bush/reed/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "G" = ( -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "H" = ( /obj/effect/holodeck_effect/mobspawner/pet, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "I" = ( /turf/open/floor/holofloor/grass, /area/template_noop) "M" = ( -/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "N" = ( @@ -88,7 +88,7 @@ /turf/open/floor/holofloor, /area/template_noop) "R" = ( -/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/holofloor/grass, /area/template_noop) "S" = ( diff --git a/_maps/templates/holodeck_winterwonderland.dmm b/_maps/templates/holodeck_winterwonderland.dmm index e22f85c183c..af4c5f16e96 100644 --- a/_maps/templates/holodeck_winterwonderland.dmm +++ b/_maps/templates/holodeck_winterwonderland.dmm @@ -1,27 +1,27 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/both/style_random, /turf/open/floor/holofloor/snow, /area/template_noop) "c" = ( -/obj/structure/flora/bush{ +/obj/structure/flora/bush/snow/style_random{ pixel_x = -2; pixel_y = 3 }, /turf/open/floor/holofloor/snow, /area/template_noop) "d" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/pine/style_random, /turf/open/floor/holofloor/snow, /area/template_noop) "h" = ( -/obj/structure/flora/tree/pine{ +/obj/structure/flora/tree/pine/style_random{ pixel_y = -6 }, /turf/open/floor/holofloor/snow, /area/template_noop) "l" = ( -/obj/structure/flora/tree/pine{ +/obj/structure/flora/tree/pine/style_random{ pixel_x = -21 }, /turf/open/floor/holofloor/snow, @@ -38,7 +38,7 @@ /turf/open/floor/holofloor/snow, /area/template_noop) "q" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/brown/style_random, /turf/open/floor/holofloor/snow, /area/template_noop) "s" = ( @@ -57,7 +57,7 @@ /turf/open/floor/holofloor/snow, /area/template_noop) "A" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/snow/style_random, /turf/open/floor/holofloor/snow, /area/template_noop) "D" = ( @@ -85,11 +85,11 @@ /turf/open/floor/holofloor/snow, /area/template_noop) "L" = ( -/obj/structure/flora/grass/green, +/obj/structure/flora/grass/green/style_random, /turf/open/floor/holofloor/snow, /area/template_noop) "O" = ( -/obj/structure/flora/bush{ +/obj/structure/flora/bush/snow/style_random{ pixel_x = 5; pixel_y = 7 }, @@ -109,7 +109,7 @@ /turf/open/floor/holofloor/snow, /area/template_noop) "R" = ( -/obj/structure/flora/tree/pine{ +/obj/structure/flora/tree/pine/style_random{ pixel_x = -10 }, /turf/open/floor/holofloor/snow, diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index b09a0d11214..fa4c59612d3 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -280,3 +280,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define SPACEVINE_HEAT_RESISTANT (1 << 0) /// Is the spacevine / flower bud cold resistant #define SPACEVINE_COLD_RESISTANT (1 << 1) + +// Flags for flora structures +#define FLORA_HERBAL (1 << 0) +#define FLORA_WOODEN (1 << 1) +#define FLORA_STONE (1 << 2) diff --git a/code/__DEFINES/flora.dm b/code/__DEFINES/flora.dm new file mode 100644 index 00000000000..1b0d1df7279 --- /dev/null +++ b/code/__DEFINES/flora.dm @@ -0,0 +1,2 @@ +#define FLORA_HARVEST_WOOD_TOOLS list(/obj/item/hatchet, /obj/item/fireaxe, /obj/item/melee/energy/sword/saber, /obj/item/melee/energy/blade) +#define FLORA_HARVEST_STONE_TOOLS list(/obj/item/pickaxe) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 367c158553a..80d4e8687ed 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -371,3 +371,9 @@ DEFINE_BITFIELD(supports_variations_flags, list( "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION, "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON, )) + +DEFINE_BITFIELD(flora_flags, list( + "FLORA_HERBAL" = FLORA_HERBAL, + "FLORA_WOODEN" = FLORA_WOODEN, + "FLORA_STONE" = FLORA_STONE, +)) diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index ce5858fb0bd..54e23c99319 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -7,7 +7,7 @@ /mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, \ /mob/living/simple_animal/hostile/asteroid/lobstrosity = 15) - flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6, /obj/structure/flora/ash/chilly = 2) + flora_spawn_list = list(/obj/structure/flora/tree/pine/style_random = 2, /obj/structure/flora/rock/icy/style_random = 2, /obj/structure/flora/rock/pile/icy/style_random = 2, /obj/structure/flora/grass/both/style_random = 6, /obj/structure/flora/ash/chilly = 2) ///Note that this spawn list is also in the lavaland generator feature_spawn_list = list(/obj/structure/geyser/wittel = 6, /obj/structure/geyser/random = 2, /obj/structure/geyser/plasma_oxide = 10, /obj/structure/geyser/protozine = 10, /obj/structure/geyser/hollowwater = 10) @@ -28,4 +28,4 @@ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3, \ SPAWN_MEGAFAUNA = 2) megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/colossus = 1) - flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6, /obj/structure/flora/ash/chilly = 1) + flora_spawn_list = list(/obj/structure/flora/rock/icy/style_random = 6, /obj/structure/flora/rock/pile/icy/style_random = 6, /obj/structure/flora/ash/chilly = 1) diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm index 5913e898655..025b904434d 100644 --- a/code/datums/mapgen/biomes/_biome.dm +++ b/code/datums/mapgen/biomes/_biome.dm @@ -7,7 +7,7 @@ ///Chance of having a mob from the fauna types list spawn var/fauna_density = 0 ///list of type paths of objects that can be spawned when the turf spawns flora - var/list/flora_types = list(/obj/structure/flora/grass/jungle) + var/list/flora_types = list(/obj/structure/flora/grass/jungle/a/style_random) ///list of type paths of mobs that can be spawned when the turf spawns fauna var/list/fauna_types = list() @@ -24,17 +24,17 @@ /datum/biome/mudlands turf_type = /turf/open/misc/dirt/jungle/dark - flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/rock/jungle, /obj/structure/flora/rock/pile/largejungle) + flora_types = list(/obj/structure/flora/grass/jungle/a/style_random,/obj/structure/flora/grass/jungle/b/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/flora/rock/pile/jungle/large/style_random) flora_density = 3 /datum/biome/plains turf_type = /turf/open/misc/grass/jungle - flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle) + flora_types = list(/obj/structure/flora/grass/jungle/a/style_random,/obj/structure/flora/grass/jungle/b/style_random, /obj/structure/flora/tree/jungle/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/flora/bush/jungle/a/style_random, /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/jungle/c/style_random, /obj/structure/flora/bush/large/style_random, /obj/structure/flora/rock/pile/jungle/large/style_random) flora_density = 15 /datum/biome/jungle turf_type = /turf/open/misc/grass/jungle - flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle) + flora_types = list(/obj/structure/flora/grass/jungle/a/style_random,/obj/structure/flora/grass/jungle/b/style_random, /obj/structure/flora/tree/jungle/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/flora/bush/jungle/a/style_random, /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/jungle/c/style_random, /obj/structure/flora/bush/large/style_random, /obj/structure/flora/rock/pile/jungle/large/style_random) flora_density = 40 /datum/biome/jungle/deep diff --git a/code/game/objects/items/kirbyplants.dm b/code/game/objects/items/kirbyplants.dm new file mode 100644 index 00000000000..32271c21ac8 --- /dev/null +++ b/code/game/objects/items/kirbyplants.dm @@ -0,0 +1,103 @@ + +/obj/item/kirbyplants + name = "potted plant" + icon = 'icons/obj/flora/plants.dmi' + icon_state = "plant-01" + desc = "A little bit of nature contained in a pot." + layer = ABOVE_MOB_LAYER + plane = GAME_PLANE_UPPER + w_class = WEIGHT_CLASS_HUGE + force = 10 + throwforce = 13 + throw_speed = 2 + throw_range = 4 + item_flags = NO_PIXEL_RANDOM_DROP + + /// Can this plant be trimmed by someone with TRAIT_BONSAI + var/trimmable = TRUE + var/list/static/random_plant_states + +/obj/item/kirbyplants/Initialize(mapload) + . = ..() + AddComponent(/datum/component/tactical) + AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10) + AddElement(/datum/element/beauty, 500) + +/obj/item/kirbyplants/attackby(obj/item/I, mob/living/user, params) + . = ..() + if(trimmable && HAS_TRAIT(user,TRAIT_BONSAI) && isturf(loc) && I.get_sharpness()) + to_chat(user,span_notice("You start trimming [src].")) + if(do_after(user,3 SECONDS,target=src)) + to_chat(user,span_notice("You finish trimming [src].")) + change_visual() + +/// Cycle basic plant visuals +/obj/item/kirbyplants/proc/change_visual() + if(!random_plant_states) + generate_states() + var/current = random_plant_states.Find(icon_state) + var/next = WRAP(current+1,1,length(random_plant_states)) + icon_state = random_plant_states[next] + +/obj/item/kirbyplants/random + icon = 'icons/obj/flora/_flora.dmi' + icon_state = "random_plant" + +/obj/item/kirbyplants/random/Initialize(mapload) + . = ..() + icon = 'icons/obj/flora/plants.dmi' + if(!random_plant_states) + generate_states() + icon_state = pick(random_plant_states) + +/obj/item/kirbyplants/proc/generate_states() + random_plant_states = list() + for(var/i in 1 to 25) + var/number + if(i < 10) + number = "0[i]" + else + number = "[i]" + random_plant_states += "plant-[number]" + random_plant_states += "applebush" + + +/obj/item/kirbyplants/dead + name = "RD's potted plant" + desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." + icon_state = "plant-25" + trimmable = FALSE + +/obj/item/kirbyplants/photosynthetic + name = "photosynthetic potted plant" + desc = "A bioluminescent plant." + icon_state = "plant-09" + light_color = COLOR_BRIGHT_BLUE + light_range = 3 + +/obj/item/kirbyplants/fullysynthetic + name = "plastic potted plant" + desc = "A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch." + icon_state = "plant-26" + custom_materials = (list(/datum/material/plastic = 8000)) + trimmable = FALSE + +/obj/item/kirbyplants/fullysynthetic/Initialize(mapload) + . = ..() + icon_state = "plant-[rand(26, 29)]" + +/obj/item/kirbyplants/potty + name = "Potty the Potted Plant" + desc = "A secret agent staffed in the station's bar to protect the mystical cakehat." + icon_state = "potty" + trimmable = FALSE + +/obj/item/kirbyplants/fern + name = "neglected fern" + desc = "An old botanical research sample collected on a long forgotten jungle planet." + icon_state = "fern" + trimmable = FALSE + +/obj/item/kirbyplants/fern/Initialize(mapload) + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 5) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 788d4b556de..bdb6c2860f0 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -221,7 +221,7 @@ "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER, ) - /// Whether this saber has beel multitooled. + /// Whether this saber has been multitooled. var/hacked = FALSE /obj/item/melee/energy/sword/saber/Initialize(mapload) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 347a26572fb..4cad3dd7b0e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -1,25 +1,295 @@ +//These globs are to make sure that each flora instance doesn't have to make a new typepath if its type already made it; aka performance junk +GLOBAL_LIST_EMPTY(flora_required_tools_typepaths) +GLOBAL_LIST_EMPTY(flora_disallowed_tools_typepaths) +GLOBAL_LIST_EMPTY(flora_uprooting_tools_typepaths) + /obj/structure/flora + name = "flora" + desc = "Some sort of plant." resistance_flags = FLAMMABLE max_integrity = 150 anchored = TRUE - /// Play a foliage rustling sound when attacking it? - var/herbage = FALSE - /// Play a wooden chop sound when attacking it? - var/wood = FALSE - /// Play a rock tap sound when attacking it? - var/rock = FALSE + drag_slowdown = 1.3 + + /// If set, the flora will have this as its name after being harvested. When the flora becomes harvestable again, it reverts to its initial(name) + var/harvested_name + /// If set, the flora will have this as its description after being harvested. When the flora becomes harvestable again, it regerts to its initial(desc) + var/harvested_desc + + /// A lazylist of products that could be created when harvesting this flora, syntax is (type = weight) + /// Because of how this works, it can spawn in anomalies if you want it to. Or wall girders + var/product_types + /// A lazylist typecache of items that can harvest this flora. + /// Will be set automatically on Initialization depending on flora_flags. + /// Paths in this list and their subtypes will be able to harvest the flora. + var/required_tools + /// A lazylist typecache of items that will be excluded from required_tools + /// Paths in this list disallows items from harvesting this flora if that item is a type of this path + var/disallowed_tools + /// If the user is able to harvest this with their hands + var/harvest_with_hands = FALSE + /// The "verb" to use when the user harvests the flora + var/harvest_verb = "harvest" + /// What should be added to harvest_verb depending on the context ("user harvest(s) the tree" / "user chop(s down) the tree") + var/harvest_verb_suffix = "s" + /// If the user is allowed to uproot the flora + var/can_uproot = TRUE + /// What tools are allowed to be used to uproot the flora + var/uprooting_tools = list(/obj/item/shovel) + var/uprooted = FALSE + var/previous_rotation = 0 + + /// If false, the flora won't be able to be harvested at all. If it's true, go through checks normally to determine if the flora is able to be harvested + var/harvestable = TRUE + /// The low end of how many product_type items you get + var/harvest_amount_low = 1 + /// The high end of how many product_type items you get + var/harvest_amount_high = 3 + + //Messages to show to the user depending on how many items they get when harvesting the flora + var/harvest_message_low + var/harvest_message_med + var/harvest_message_high + /// See proc/harvest() and where this is used for an explaination on how this works + var/harvest_message_true_thresholds = FALSE + + /// How long it takes to harvest the flora with the correct tool + var/harvest_time = 6 SECONDS + var/delete_on_harvest = FALSE + var/harvested = FALSE + + /// Variables for determining the low/high ends of how long it takes for the flora takes to grow. + var/regrowth_time_low = 8 MINUTES + /// Stops the flora from regrowing if this is set to 0 + var/regrowth_time_high = 16 MINUTES + + /// Flags for the flora to determine what kind of sound to play when it gets hit + var/flora_flags = NONE + +/obj/structure/flora/Initialize(mapload) + . = ..() + if(!required_tools) + required_tools = list() + if(flora_flags & FLORA_WOODEN) + required_tools += FLORA_HARVEST_WOOD_TOOLS + if(flora_flags & FLORA_STONE) + required_tools += FLORA_HARVEST_STONE_TOOLS + + //ugly-looking performance optimization. what the glob bro + if(!GLOB.flora_required_tools_typepaths[type]) + GLOB.flora_required_tools_typepaths[type] = typecacheof(required_tools) + if(!GLOB.flora_disallowed_tools_typepaths[type]) + GLOB.flora_disallowed_tools_typepaths[type] = typecacheof(disallowed_tools) + if(!GLOB.flora_uprooting_tools_typepaths[type]) + GLOB.flora_uprooting_tools_typepaths[type] = typecacheof(uprooting_tools) + + required_tools = GLOB.flora_required_tools_typepaths[type] + disallowed_tools = GLOB.flora_disallowed_tools_typepaths[type] + uprooting_tools = GLOB.flora_uprooting_tools_typepaths[type] + +/obj/structure/flora/attackby(obj/item/W, mob/living/user, params) + if(user.combat_mode) + return ..() + + if(can_uproot && is_type_in_typecache(W, uprooting_tools)) + if(uprooted) + user.visible_message(span_notice("[user] starts to replant [src]..."), + span_notice("You start to replant [src]...")) + else + user.visible_message(span_notice("[user] starts to uproot [src]..."), + span_notice("You start to uproot [src]...")) + W.play_tool_sound(src, 50) + if(!do_after(user, harvest_time, src)) + return + if(uprooted) + user.visible_message(span_notice("[user] replants [src]."), + span_notice("You replant [src].")) + replant(user) + else + user.visible_message(span_notice("[user] uproots [src]."), + span_notice("You uproot [src].")) + uproot(user) + W.play_tool_sound(src, 50) + return + + if(!can_harvest(user, W)) + return ..() + + user.visible_message(span_notice("[user] starts to [harvest_verb] [src]..."), + span_notice("You start to [harvest_verb] [src] with [W]...")) + play_attack_sound(W.force) + if(!do_after(user, harvest_time, src)) + return + visible_message(span_notice("[user] [harvest_verb][harvest_verb_suffix] [src]."), + ignored_mobs = list(user)) + play_attack_sound(W.force) + + if(harvest(user)) + after_harvest(user) + +/obj/structure/flora/attack_hand(mob/user, list/modifiers) + . = ..() + if(.) + return + if(!can_harvest(user) || !harvest_with_hands) + return + + user.visible_message(span_notice("[user] starts to [harvest_verb] [src]..."), + span_notice("You start to [harvest_verb] [src]...")) + play_attack_sound() + if(!do_after(user, harvest_time, src)) + return + visible_message(span_notice("[user] [harvest_verb][harvest_verb_suffix] [src]."), + ignored_mobs = list(user)) + play_attack_sound() + + if(harvest(user)) + after_harvest(user) /obj/structure/flora/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - if(!wood && !herbage && !rock) - return ..() //play generic metal thunk, tap or welder sound instead - if(herbage) + var/use_default_sound = TRUE //Because I don't wanna do unnecessary bitflag checks in a single if statement, while also allowing for multiple sounds to be played + if(flora_flags & FLORA_HERBAL) playsound(src, SFX_CRUNCHY_BUSH_WHACK, 50, vary = FALSE) - if(wood) + use_default_sound = FALSE + if(flora_flags & FLORA_WOODEN) playsound(src, SFX_TREE_CHOP, 50, vary = FALSE) - if(rock) + use_default_sound = FALSE + if(flora_flags & FLORA_STONE) playsound(src, SFX_ROCK_TAP, 50, vary = FALSE) + use_default_sound = FALSE + if(use_default_sound) + return ..() + +/* + * A helper proc for getting a random amount of products, associated with the flora's product list. + * Returns: A list where each value is (product_type = amount_of_products) + */ +/obj/structure/flora/proc/get_products_list() + if(!LAZYLEN(product_types)) + return list() + var/list/product_list = list() + + var/harvest_amount = rand(harvest_amount_low, harvest_amount_high) + for(var/iteration in 1 to harvest_amount) + var/chosen_product = pick_weight(product_types) + if(!product_list[chosen_product]) + product_list[chosen_product] = 0 + product_list[chosen_product]++ + return product_list + +/* + * A helper proc that determines if a user can currently harvest this flora with whatever tool they're trying to use. + * Returns: TRUE if they can harvest, FALSE if not. Null if it's not harvestable at all. + */ +/obj/structure/flora/proc/can_harvest(mob/user, obj/item/harvesting_item) + . = FALSE + if(harvested || !harvestable) + return null + + if(harvesting_item) + if(!is_type_in_typecache(harvesting_item, required_tools)) + return + if(is_type_in_typecache(harvesting_item, disallowed_tools)) + return + return TRUE + +/* + * This gets called after a mob tries to harvest this flora with the correct tool. + * It displays a flavor message to whoever's harvesting this flora, then creates new products depending on the flora's product list. + * Also renames the flora if harvested_name or harvested_desc is set in the variables + * Returns: FALSE if nothing was made, otherwise a list of created products + */ +/obj/structure/flora/proc/harvest(user) + . = FALSE + if(harvested && !LAZYLEN(product_types)) + return + + var/list/products_to_create = get_products_list() + if(!products_to_create.len) + return + + var/products_created = 0 + var/turf/turf_below = get_turf(src) + + //This loop creates new products on the turf of our flora, but checks if it's an item stack + //If it *is* an item stack, we don't want to go through 50 different iterations of a new object where it just gets qdeleted after the first + . = list() + for(var/product in products_to_create) + var/amount_to_create = products_to_create[product] + products_created += amount_to_create + if(ispath(product, /obj/item/stack)) + var/product_left = amount_to_create + while(product_left > 0) + var/obj/item/stack/new_stack = new product(turf_below) + product_left -= new_stack.amount = min(product_left, new_stack.max_amount) + . += new_stack + else + for(var/iteration in 1 to amount_to_create) + . += new product(turf_below) + + //This bit of code determines what should be shown to the user when this is harvested + var/message = harvest_message_med || harvest_message_high || harvest_message_low + if(user && message) + if(harvest_message_true_thresholds) //Old method of how the harvest messages worked. Useful depending on the context you want to implement + if(products_created == harvest_amount_low && harvest_message_low) + message = harvest_message_low + if(products_created == harvest_amount_high && harvest_message_high) + message = harvest_message_high + else //New method of determining the message to display. Separates the messages into 3 different viable "regions" + //[ ][ ][ ] the default message depends on whether or not something's nulled out + var/comparison = products_created - harvest_amount_low //avoiding unnecessary math + var/middle_value = round((harvest_amount_high - harvest_amount_low)/2) + harvest_amount_low //mathy shit, gets the middle between two values + //[***][ ][ ] + if(comparison < (middle_value - harvest_amount_low)/2 && harvest_message_low) //more mathy shit, gets the middle between middle_value and harvest_amount_low + message = harvest_message_low + //[ ][ ][***] + if(comparison > (harvest_amount_high - middle_value)/2 && harvest_message_high) //the middle between middle_value and harvest_amount_high + message = harvest_message_high + //[ ][***][ ] use the default message if none of the above applies + + to_chat(user, span_notice(message)) + + if(harvested_name) + name = harvested_name + if(harvested_desc) + desc = harvested_desc + harvested = TRUE + if(!delete_on_harvest && regrowth_time_high > 0) + addtimer(CALLBACK(src, .proc/regrow), rand(regrowth_time_low, regrowth_time_high)) + +/obj/structure/flora/proc/after_harvest(user) + if(delete_on_harvest) + qdel(src) + +/obj/structure/flora/proc/regrow() + name = initial(name) + desc = initial(desc) + harvested = FALSE + +/* + * Called after the user uproots the flora with a shovel. + */ +/obj/structure/flora/proc/uproot(mob/living/user) + anchored = FALSE + uprooted = TRUE + var/matrix/M = matrix(transform) + previous_rotation = pick(-90, 90) + transform = M.Turn(previous_rotation) + +/* + * Called after the user plants the flora back into the ground after uprooted + */ +/obj/structure/flora/proc/replant(mob/living/user) + anchored = initial(anchored) + uprooted = FALSE + var/matrix/M = matrix(transform) + transform = M.Turn(-previous_rotation) + +/********* + * Trees * + *********/ +//Can *you* speak their language? -//trees /obj/structure/flora/tree name = "tree" desc = "A large tree." @@ -27,57 +297,131 @@ pixel_x = -16 layer = FLY_LAYER plane = ABOVE_GAME_PLANE - var/log_amount = 10 - herbage = TRUE - wood = TRUE + drag_slowdown = 1.5 + product_types = list(/obj/item/grown/log/tree = 1) + harvest_amount_low = 6 + harvest_amount_high = 10 + harvest_message_low = "You manage to gather a few logs from the tree." + harvest_message_med = "You manage to gather some logs from the tree." + harvest_message_high = "You manage to get most of the wood from the tree." + harvest_verb = "chop" + harvest_verb_suffix = "s down" + delete_on_harvest = TRUE + flora_flags = FLORA_HERBAL | FLORA_WOODEN -/obj/structure/flora/tree/attackby(obj/item/attacking_item, mob/user, params) - if(!log_amount || flags_1 & NODECONSTRUCT_1) - return ..() - if(!attacking_item.get_sharpness() || attacking_item.force <= 0) - return ..() - var/my_turf = get_turf(src) - if(attacking_item.hitsound) - playsound(my_turf, attacking_item.hitsound, 100, FALSE, FALSE) - user.visible_message(span_notice("[user] begins to cut down [src] with [attacking_item]."),span_notice("You begin to cut down [src] with [attacking_item]."), span_hear("You hear sawing.")) - if(!do_after(user, 1000/attacking_item.force, target = src)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard. - return - user.visible_message(span_notice("[user] fells [src] with [attacking_item]."),span_notice("You fell [src] with [attacking_item]."), span_hear("You hear the sound of a tree falling.")) +/obj/structure/flora/tree/harvest(mob/living/user) + . = ..() + var/turf/my_turf = get_turf(src) playsound(my_turf, 'sound/effects/meteorimpact.ogg', 100 , FALSE, FALSE) - user.log_message("cut down [src] at [AREACOORD(src)]", LOG_ATTACK) - for(var/i=1 to log_amount) - new /obj/item/grown/log/tree(drop_location()) - var/obj/structure/flora/stump/new_stump = new(my_turf) + var/obj/structure/flora/tree/stump/new_stump = new(my_turf) new_stump.name = "[name] stump" - qdel(src) -/obj/structure/flora/stump +/obj/structure/flora/tree/uproot(mob/living/user) + ..() + playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , FALSE, FALSE) + +/obj/structure/flora/tree/stump name = "stump" desc = "This represents our promise to the crew, and the station itself, to cut down as many trees as possible." //running naked through the trees icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "tree_stump" density = FALSE - pixel_x = -16 - wood = TRUE + delete_on_harvest = TRUE + +/obj/structure/flora/tree/stump/harvest(mob/living/user) + to_chat(user, span_notice("You manage to remove [src].")) + qdel(src) + +/obj/structure/flora/tree/stump/uproot(mob/living/user) + ..() + to_chat(user, span_notice("You manage to remove [src].")) + qdel(src) + +/obj/structure/flora/tree/dead + icon = 'icons/obj/flora/deadtrees.dmi' + desc = "A dead tree. How it died, you know not." + icon_state = "tree_1" + harvest_amount_low = 2 + harvest_amount_high = 6 + flora_flags = FLORA_WOODEN + +/obj/structure/flora/tree/dead/style_2 + icon_state = "tree_2" +/obj/structure/flora/tree/dead/style_3 + icon_state = "tree_3" +/obj/structure/flora/tree/dead/style_4 + icon_state = "tree_4" +/obj/structure/flora/tree/dead/style_5 + icon_state = "tree_5" +/obj/structure/flora/tree/dead/style_6 + icon_state = "tree_6" +/obj/structure/flora/tree/dead/style_random/Initialize(mapload) + . = ..() + icon_state = "tree_[rand(1, 6)]" + +/obj/structure/flora/tree/jungle + desc = "It's seriously hampering your view of the jungle." + icon = 'icons/obj/flora/jungletrees.dmi' + icon_state = "tree1" + pixel_x = -48 + pixel_y = -20 + +/obj/structure/flora/tree/jungle/style_2 + icon_state = "tree2" +/obj/structure/flora/tree/jungle/style_3 + icon_state = "tree3" +/obj/structure/flora/tree/jungle/style_4 + icon_state = "tree4" +/obj/structure/flora/tree/jungle/style_5 + icon_state = "tree5" +/obj/structure/flora/tree/jungle/style_6 + icon_state = "tree6" +/obj/structure/flora/tree/jungle/style_random/Initialize(mapload) + . = ..() + icon_state = "tree[rand(1, 6)]" + +/obj/structure/flora/tree/jungle/small + pixel_y = 0 + pixel_x = -32 + icon = 'icons/obj/flora/jungletreesmall.dmi' + icon_state = "tree1" + +/obj/structure/flora/tree/jungle/small/style_2 + icon_state = "tree2" +/obj/structure/flora/tree/jungle/small/style_3 + icon_state = "tree3" +/obj/structure/flora/tree/jungle/small/style_4 + icon_state = "tree4" +/obj/structure/flora/tree/jungle/small/style_5 + icon_state = "tree5" +/obj/structure/flora/tree/jungle/small/style_6 + icon_state = "tree6" +/obj/structure/flora/tree/jungle/small/style_random/Initialize(mapload) + . = ..() + icon_state = "tree[rand(1, 6)]" + +/************** + * Pine Trees * + **************/ /obj/structure/flora/tree/pine name = "pine tree" desc = "A coniferous pine tree." icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "pine_1" - var/list/icon_states = list("pine_1", "pine_2", "pine_3") -/obj/structure/flora/tree/pine/Initialize(mapload) +/obj/structure/flora/tree/pine/style_2 + icon_state = "pine_2" +/obj/structure/flora/tree/pine/style_3 + icon_state = "pine_3" +/obj/structure/flora/tree/pine/style_random/Initialize(mapload) . = ..() - - if(islist(icon_states?.len)) - icon_state = pick(icon_states) + icon_state = "pine_[rand(1,3)]" /obj/structure/flora/tree/pine/xmas name = "xmas tree" desc = "A wondrous decorated Christmas tree." icon_state = "pine_c" - icon_states = null flags_1 = NODECONSTRUCT_1 //protected by the christmas spirit /obj/structure/flora/tree/pine/xmas/presents @@ -114,31 +458,11 @@ desc = "A wonderous decorated Christmas tree. It has a seemly endless supply of presents!" unlimited = TRUE -/obj/structure/flora/tree/dead - icon = 'icons/obj/flora/deadtrees.dmi' - desc = "A dead tree. How it died, you know not." - icon_state = "tree_1" - herbage = FALSE - -/obj/structure/flora/tree/dead/Initialize(mapload) - icon_state = "tree_[rand(1, 6)]" - return ..() - -/obj/structure/flora/tree/palm - icon = 'icons/misc/beach2.dmi' - desc = "A tree straight from the tropics." - icon_state = "palm1" - -/obj/structure/flora/tree/palm/Initialize(mapload) - . = ..() - icon_state = pick("palm1","palm2") - pixel_x = 0 - /obj/structure/festivus name = "festivus pole" + desc = "During last year's Feats of Strength the Research Director was able to suplex this passing immobile rod into a planter." icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "festivus_pole" - desc = "During last year's Feats of Strength the Research Director was able to suplex this passing immobile rod into a planter." /obj/structure/festivus/anchored name = "suplexed rod" @@ -146,390 +470,455 @@ icon_state = "anchored_rod" anchored = TRUE -/obj/structure/flora/tree/jungle - name = "tree" - icon_state = "tree" - desc = "It's seriously hampering your view of the jungle." - icon = 'icons/obj/flora/jungletrees.dmi' - pixel_x = -48 - pixel_y = -20 +/************** + * Palm Trees * + **************/ -/obj/structure/flora/tree/jungle/Initialize(mapload) - icon_state = "[icon_state][rand(1, 6)]" +/obj/structure/flora/tree/palm + name = "palm tree" + desc = "A tree straight from the tropics." + icon = 'icons/misc/beach2.dmi' + icon_state = "palm1" + pixel_x = 0 + +/obj/structure/flora/tree/palm/style_2 + icon_state = "palm2" +/obj/structure/flora/tree/palm/style_random/Initialize(mapload) . = ..() + icon_state = "palm[rand(1,2)]" -/obj/structure/flora/tree/jungle/small - pixel_y = 0 - pixel_x = -32 - icon = 'icons/obj/flora/jungletreesmall.dmi' - -//grass +/********* + * Grass * + *********/ /obj/structure/flora/grass name = "grass" desc = "A patch of overgrown grass." icon = 'icons/obj/flora/snowflora.dmi' gender = PLURAL //"this is grass" not "this is a grass" - herbage = TRUE + product_types = list(/obj/item/food/grown/grass = 10, /obj/item/seeds/grass = 1) + harvest_with_hands = TRUE + harvest_amount_low = 0 + harvest_amount_high = 2 + harvest_message_low = "You uproot the grass from the ground, just for the fun of it." + harvest_message_med = "You gather up some grass." + harvest_message_high = "You gather up a handful grass." + can_uproot = TRUE + flora_flags = FLORA_HERBAL /obj/structure/flora/grass/brown icon_state = "snowgrass1bb" - -/obj/structure/flora/grass/brown/Initialize(mapload) - icon_state = "snowgrass[rand(1, 3)]bb" +/obj/structure/flora/grass/brown/style_2 + icon_state = "snowgrass2bb" +/obj/structure/flora/grass/brown/style_3 + icon_state = "snowgrass2bb" +/obj/structure/flora/grass/brown/style_random/Initialize(mapload) . = ..() - + icon_state = "snowgrass[rand(1, 3)]bb" /obj/structure/flora/grass/green icon_state = "snowgrass1gb" - -/obj/structure/flora/grass/green/Initialize(mapload) - icon_state = "snowgrass[rand(1, 3)]gb" +/obj/structure/flora/grass/green/style_2 + icon_state = "snowgrass2gb" +/obj/structure/flora/grass/green/style_3 + icon_state = "snowgrass3gb" +/obj/structure/flora/grass/green/style_random/Initialize(mapload) . = ..() + icon_state = "snowgrass[rand(1, 3)]gb" /obj/structure/flora/grass/both icon_state = "snowgrassall1" - -/obj/structure/flora/grass/both/Initialize(mapload) +/obj/structure/flora/grass/both/style_2 + icon_state = "snowgrassall2" +/obj/structure/flora/grass/both/style_3 + icon_state = "snowgrassall3" +/obj/structure/flora/grass/both/style_random/Initialize(mapload) + . = ..() icon_state = "snowgrassall[rand(1, 3)]" - . = ..() - - -//bushes -/obj/structure/flora/bush - name = "bush" - desc = "Some type of shrub." - icon = 'icons/obj/flora/snowflora.dmi' - icon_state = "snowbush1" - anchored = TRUE - herbage = TRUE - -/obj/structure/flora/bush/Initialize(mapload) - icon_state = "snowbush[rand(1, 6)]" - . = ..() - -//newbushes - -/obj/structure/flora/ausbushes - name = "bush" - desc = "Some kind of plant." - icon = 'icons/obj/flora/ausflora.dmi' - icon_state = "firstbush_1" - herbage = TRUE - -/obj/structure/flora/ausbushes/Initialize(mapload) - if(icon_state == "firstbush_1") - icon_state = "firstbush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/reedbush - icon_state = "reedbush_1" - -/obj/structure/flora/ausbushes/reedbush/Initialize(mapload) - icon_state = "reedbush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/leafybush - icon_state = "leafybush_1" - -/obj/structure/flora/ausbushes/leafybush/Initialize(mapload) - icon_state = "leafybush_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/palebush - icon_state = "palebush_1" - -/obj/structure/flora/ausbushes/palebush/Initialize(mapload) - icon_state = "palebush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/stalkybush - icon_state = "stalkybush_1" - -/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload) - icon_state = "stalkybush_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/grassybush - icon_state = "grassybush_1" - -/obj/structure/flora/ausbushes/grassybush/Initialize(mapload) - icon_state = "grassybush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/fernybush - icon_state = "fernybush_1" - -/obj/structure/flora/ausbushes/fernybush/Initialize(mapload) - icon_state = "fernybush_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/sunnybush - icon_state = "sunnybush_1" - -/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload) - icon_state = "sunnybush_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/genericbush - icon_state = "genericbush_1" - -/obj/structure/flora/ausbushes/genericbush/Initialize(mapload) - icon_state = "genericbush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/pointybush - icon_state = "pointybush_1" - -/obj/structure/flora/ausbushes/pointybush/Initialize(mapload) - icon_state = "pointybush_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/lavendergrass - icon_state = "lavendergrass_1" - -/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload) - icon_state = "lavendergrass_[rand(1, 4)]" - . = ..() - -/obj/structure/flora/ausbushes/ywflowers - icon_state = "ywflowers_1" - -/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload) - icon_state = "ywflowers_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/brflowers - icon_state = "brflowers_1" - -/obj/structure/flora/ausbushes/brflowers/Initialize(mapload) - icon_state = "brflowers_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/ppflowers - icon_state = "ppflowers_1" - -/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload) - icon_state = "ppflowers_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/sparsegrass - icon_state = "sparsegrass_1" - -/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload) - icon_state = "sparsegrass_[rand(1, 3)]" - . = ..() - -/obj/structure/flora/ausbushes/fullgrass - icon_state = "fullgrass_1" - -/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload) - icon_state = "fullgrass_[rand(1, 3)]" - . = ..() - -/obj/item/kirbyplants - name = "potted plant" - icon = 'icons/obj/flora/plants.dmi' - icon_state = "plant-01" - desc = "A little bit of nature contained in a pot." - layer = ABOVE_MOB_LAYER - plane = GAME_PLANE_UPPER - w_class = WEIGHT_CLASS_HUGE - force = 10 - throwforce = 13 - throw_speed = 2 - throw_range = 4 - item_flags = NO_PIXEL_RANDOM_DROP - - /// Can this plant be trimmed by someone with TRAIT_BONSAI - var/trimmable = TRUE - var/list/static/random_plant_states - -/obj/item/kirbyplants/ComponentInitialize() - . = ..() - AddComponent(/datum/component/tactical) - AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10) - AddElement(/datum/element/beauty, 500) - -/obj/item/kirbyplants/attackby(obj/item/I, mob/living/user, params) - . = ..() - if(trimmable && HAS_TRAIT(user,TRAIT_BONSAI) && isturf(loc) && I.get_sharpness()) - to_chat(user,span_notice("You start trimming [src].")) - if(do_after(user,3 SECONDS,target=src)) - to_chat(user,span_notice("You finish trimming [src].")) - change_visual() - -/// Cycle basic plant visuals -/obj/item/kirbyplants/proc/change_visual() - if(!random_plant_states) - generate_states() - var/current = random_plant_states.Find(icon_state) - var/next = WRAP(current+1,1,length(random_plant_states)) - icon_state = random_plant_states[next] - -/obj/item/kirbyplants/random - icon = 'icons/obj/flora/_flora.dmi' - icon_state = "random_plant" - -/obj/item/kirbyplants/random/Initialize(mapload) - . = ..() - icon = 'icons/obj/flora/plants.dmi' - if(!random_plant_states) - generate_states() - icon_state = pick(random_plant_states) - -/obj/item/kirbyplants/proc/generate_states() - random_plant_states = list() - for(var/i in 1 to 25) - var/number - if(i < 10) - number = "0[i]" - else - number = "[i]" - random_plant_states += "plant-[number]" - random_plant_states += "applebush" - - -/obj/item/kirbyplants/dead - name = "RD's potted plant" - desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." - icon_state = "plant-25" - trimmable = FALSE - -/obj/item/kirbyplants/photosynthetic - name = "photosynthetic potted plant" - desc = "A bioluminescent plant." - icon_state = "plant-09" - light_color = COLOR_BRIGHT_BLUE - light_range = 3 - -/obj/item/kirbyplants/fullysynthetic - name = "plastic potted plant" - desc = "A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch." - icon_state = "plant-26" - custom_materials = (list(/datum/material/plastic = 8000)) - trimmable = FALSE - -/obj/item/kirbyplants/fullysynthetic/Initialize(mapload) - . = ..() - icon_state = "plant-[rand(26, 29)]" - -/obj/item/kirbyplants/potty - name = "Potty the Potted Plant" - desc = "A secret agent staffed in the station's bar to protect the mystical cakehat." - icon_state = "potty" - trimmable = FALSE - -/obj/item/kirbyplants/fern - name = "neglected fern" - desc = "An old botanical research sample collected on a long forgotten jungle planet." - icon_state = "fern" - trimmable = FALSE - -/obj/item/kirbyplants/fern/Initialize(mapload) - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 5) - -//a rock is flora according to where the icon file is -//and now these defines - -/obj/structure/flora/rock - icon_state = "basalt" - desc = "A volcanic rock. Pioneers used to ride these babies for miles." - icon = 'icons/obj/flora/rocks.dmi' - resistance_flags = FIRE_PROOF - density = TRUE - /// Itemstack that is dropped when a rock is mined with a pickaxe - var/obj/item/stack/mineResult = /obj/item/stack/ore/glass/basalt - /// Amount of the itemstack to drop - var/mineAmount = 20 - rock = TRUE - -/obj/structure/flora/rock/Initialize(mapload) - . = ..() - icon_state = "[icon_state][rand(1,3)]" - -/obj/structure/flora/rock/attackby(obj/item/attacking_item, mob/user, params) - if(!mineResult || attacking_item.tool_behaviour != TOOL_MINING) - return ..() - if(flags_1 & NODECONSTRUCT_1) - return ..() - to_chat(user, span_notice("You start mining...")) - if(!attacking_item.use_tool(src, user, 40, volume=50)) - return - to_chat(user, span_notice("You finish mining the rock.")) - if(mineResult && mineAmount) - new mineResult(loc, mineAmount) - SSblackbox.record_feedback("tally", "pick_used_mining", 1, attacking_item.type) - qdel(src) - -/obj/structure/flora/rock/pile - icon_state = "lavarocks" - desc = "A pile of rocks." - -//Jungle grass /obj/structure/flora/grass/jungle name = "jungle grass" desc = "Thick alien flora." icon = 'icons/obj/flora/jungleflora.dmi' - icon_state = "grassa" + icon_state = "grassa1" - -/obj/structure/flora/grass/jungle/Initialize(mapload) - icon_state = "[icon_state][rand(1, 5)]" +/obj/structure/flora/grass/jungle/a/style_2 + icon_state = "grassa2" +/obj/structure/flora/grass/jungle/a/style_3 + icon_state = "grassa3" +/obj/structure/flora/grass/jungle/a/style_4 + icon_state = "grassa4" +/obj/structure/flora/grass/jungle/a/style_5 + icon_state = "grassa5" +/obj/structure/flora/grass/jungle/a/style_random/Initialize(mapload) . = ..() + icon_state = "grassa[rand(1, 5)]" /obj/structure/flora/grass/jungle/b - icon_state = "grassb" - -//Jungle rocks - -/obj/structure/flora/rock/jungle - icon_state = "rock" - desc = "A pile of rocks." - icon = 'icons/obj/flora/jungleflora.dmi' - density = FALSE - -/obj/structure/flora/rock/jungle/Initialize(mapload) + icon_state = "grassb1" +/obj/structure/flora/grass/jungle/b/style_2 + icon_state = "grassb2" +/obj/structure/flora/grass/jungle/b/style_3 + icon_state = "grassb3" +/obj/structure/flora/grass/jungle/b/style_4 + icon_state = "grassb4" +/obj/structure/flora/grass/jungle/b/style_5 + icon_state = "grassb5" +/obj/structure/flora/grass/jungle/b/style_random/Initialize(mapload) . = ..() - icon_state = "[initial(icon_state)][rand(1,5)]" + icon_state = "grassb[rand(1, 5)]" +/********** + * Bushes * + **********/ -//Jungle bushes - -/obj/structure/flora/junglebush +/obj/structure/flora/bush name = "bush" + desc = "Some type of shrubbery. Known for causing considerable economic stress on designers." + icon = 'icons/obj/flora/ausflora.dmi' + icon_state = "firstbush_1" + flora_flags = FLORA_HERBAL + +/obj/structure/flora/bush/style_2 + icon_state = "firstbush_2" +/obj/structure/flora/bush/style_3 + icon_state = "firstbush_3" +/obj/structure/flora/bush/style_4 + icon_state = "firstbush_4" +/obj/structure/flora/bush/style_random/Initialize(mapload) + . = ..() + icon_state = "firstbush_[rand(1, 4)]" + +/obj/structure/flora/bush/reed + icon_state = "reedbush_1" +/obj/structure/flora/bush/reed/style_2 + icon_state = "reedbush_2" +/obj/structure/flora/bush/reed/style_3 + icon_state = "reedbush_3" +/obj/structure/flora/bush/reed/style_4 + icon_state = "reedbush_4" +/obj/structure/flora/bush/reed/style_random/Initialize(mapload) + . = ..() + icon_state = "reedbush_[rand(1, 4)]" + +/obj/structure/flora/bush/leafy + icon_state = "leafybush_1" +/obj/structure/flora/bush/leavy/style_2 + icon_state = "leafybush_2" +/obj/structure/flora/bush/leavy/style_3 + icon_state = "leafybush_3" +/obj/structure/flora/bush/leavy/style_random/Initialize(mapload) + . = ..() + icon_state = "leafybush_[rand(1, 3)]" + +/obj/structure/flora/bush/pale + icon_state = "palebush_1" +/obj/structure/flora/bush/pale/style_2 + icon_state = "palebush_2" +/obj/structure/flora/bush/pale/style_3 + icon_state = "palebush_3" +/obj/structure/flora/bush/pale/style_4 + icon_state = "palebush_4" +/obj/structure/flora/bush/pale/style_random/Initialize(mapload) + . = ..() + icon_state = "palebush_[rand(1, 4)]" + +/obj/structure/flora/bush/stalky + icon_state = "stalkybush_1" +/obj/structure/flora/bush/stalky/style_2 + icon_state = "stalkybush_2" +/obj/structure/flora/bush/stalky/style_3 + icon_state = "stalkybush_3" +/obj/structure/flora/bush/stalky/style_random/Initialize(mapload) + . = ..() + icon_state = "stalkybush_[rand(1, 3)]" + +/obj/structure/flora/bush/grassy + icon_state = "grassybush_1" +/obj/structure/flora/bush/grassy/style_2 + icon_state = "grassybush_2" +/obj/structure/flora/bush/grassy/style_3 + icon_state = "grassybush_3" +/obj/structure/flora/bush/grassy/style_4 + icon_state = "grassybush_4" +/obj/structure/flora/bush/grassy/style_random/Initialize(mapload) + . = ..() + icon_state = "grassybush_[rand(1, 4)]" + +/obj/structure/flora/bush/sparsegrass + icon_state = "sparsegrass_1" +/obj/structure/flora/bush/sparsegrass/style_2 + icon_state = "sparsegrass_2" +/obj/structure/flora/bush/sparsegrass/style_3 + icon_state = "sparsegrass_3" +/obj/structure/flora/bush/sparsegrass/style_random/Initialize(mapload) + . = ..() + icon_state = "sparsegrass_[rand(1, 3)]" + +/obj/structure/flora/bush/fullgrass + icon_state = "fullgrass_1" +/obj/structure/flora/bush/fullgrass/style_2 + icon_state = "fullgrass_2" +/obj/structure/flora/bush/fullgrass/style_3 + icon_state = "fullgrass_3" +/obj/structure/flora/bush/fullgrass/style_random/Initialize(mapload) + . = ..() + icon_state = "fullgrass_[rand(1, 3)]" + +/obj/structure/flora/bush/ferny + icon_state = "fernybush_1" +/obj/structure/flora/bush/ferny/style_2 + icon_state = "fernybush_2" +/obj/structure/flora/bush/ferny/style_3 + icon_state = "fernybush_3" +/obj/structure/flora/bush/ferny/style_random/Initialize(mapload) + . = ..() + icon_state = "fernybush_[rand(1, 3)]" + +/obj/structure/flora/bush/sunny + icon_state = "sunnybush_1" +/obj/structure/flora/bush/sunny/style_2 + icon_state = "sunnybush_2" +/obj/structure/flora/bush/sunny/style_3 + icon_state = "sunnybush_3" +/obj/structure/flora/bush/sunny/style_random/Initialize(mapload) + . = ..() + icon_state = "sunnybush_[rand(1, 3)]" + +/obj/structure/flora/bush/generic + icon_state = "genericbush_1" +/obj/structure/flora/bush/generic/style_2 + icon_state = "genericbush_2" +/obj/structure/flora/bush/generic/style_3 + icon_state = "genericbush_3" +/obj/structure/flora/bush/generic/style_4 + icon_state = "genericbush_4" +/obj/structure/flora/bush/generic/style_random/Initialize(mapload) + . = ..() + icon_state = "genericbush_[rand(1, 4)]" + +/obj/structure/flora/bush/pointy + icon_state = "pointybush_1" +/obj/structure/flora/bush/pointy/style_2 + icon_state = "pointybush_2" +/obj/structure/flora/bush/pointy/style_3 + icon_state = "pointybush_3" +/obj/structure/flora/bush/pointy/style_4 + icon_state = "pointybush_4" +/obj/structure/flora/bush/pointy/style_random/Initialize(mapload) + . = ..() + icon_state = "pointybush_[rand(1, 4)]" + +/obj/structure/flora/bush/lavendergrass + icon_state = "lavendergrass_1" +/obj/structure/flora/bush/lavendergrass/style_2 + icon_state = "lavendergrass_2" +/obj/structure/flora/bush/lavendergrass/style_3 + icon_state = "lavendergrass_3" +/obj/structure/flora/bush/lavendergrass/style_4 + icon_state = "lavendergrass_4" +/obj/structure/flora/bush/lavendergrass/style_random/Initialize(mapload) + . = ..() + icon_state = "lavendergrass_[rand(1, 4)]" + +/obj/structure/flora/bush/flowers_yw + icon_state = "ywflowers_1" +/obj/structure/flora/bush/flowers_yw/style_2 + icon_state = "ywflowers_2" +/obj/structure/flora/bush/flowers_yw/style_3 + icon_state = "ywflowers_3" +/obj/structure/flora/bush/flowers_yw/style_random/Initialize(mapload) + . = ..() + icon_state = "ywflowers_[rand(1, 3)]" + +/obj/structure/flora/bush/flowers_br + icon_state = "brflowers_1" +/obj/structure/flora/bush/flowers_br/style_2 + icon_state = "brflowers_2" +/obj/structure/flora/bush/flowers_br/style_3 + icon_state = "brflowers_3" +/obj/structure/flora/bush/flowers_br/style_random/Initialize(mapload) + . = ..() + icon_state = "brflowers_[rand(1, 3)]" + +/obj/structure/flora/bush/flowers_pp + icon_state = "ppflowers_1" +/obj/structure/flora/bush/flowers_pp/style_2 + icon_state = "ppflowers_2" +/obj/structure/flora/bush/flowers_pp/style_3 + icon_state = "ppflowers_3" +/obj/structure/flora/bush/flowers_pp/style_random/Initialize(mapload) + . = ..() + icon_state = "ppflowers_[rand(1, 3)]" + +/obj/structure/flora/bush/snow + icon = 'icons/obj/flora/snowflora.dmi' + icon_state = "snowbush1" + +/obj/structure/flora/bush/snow/style_2 + icon_state = "snowbush2" +/obj/structure/flora/bush/snow/style_3 + icon_state = "snowbush3" +/obj/structure/flora/bush/snow/style_4 + icon_state = "snowbush4" +/obj/structure/flora/bush/snow/style_5 + icon_state = "snowbush5" +/obj/structure/flora/bush/snow/style_6 + icon_state = "snowbush6" +/obj/structure/flora/bush/snow/style_random/Initialize(mapload) + . = ..() + icon_state = "snowbush[rand(1, 6)]" + +/obj/structure/flora/bush/jungle desc = "A wild plant that is found in jungles." icon = 'icons/obj/flora/jungleflora.dmi' - icon_state = "busha" - herbage = TRUE + icon_state = "busha1" + flora_flags = FLORA_HERBAL -/obj/structure/flora/junglebush/Initialize(mapload) - icon_state = "[icon_state][rand(1, 3)]" +/obj/structure/flora/bush/jungle/a/style_2 + icon_state = "busha2" +/obj/structure/flora/bush/jungle/a/style_3 + icon_state = "busha3" +/obj/structure/flora/bush/jungle/a/style_random/Initialize(mapload) . = ..() + icon_state = "busha[rand(1, 3)]" -/obj/structure/flora/junglebush/b - icon_state = "bushb" +/obj/structure/flora/bush/jungle/b + icon_state = "bushb1" +/obj/structure/flora/bush/jungle/b/style_2 + icon_state = "bushb2" +/obj/structure/flora/bush/jungle/b/style_3 + icon_state = "bushb3" +/obj/structure/flora/bush/jungle/b/style_random/Initialize(mapload) + . = ..() + icon_state = "bushb[rand(1, 3)]" -/obj/structure/flora/junglebush/c - icon_state = "bushc" +/obj/structure/flora/bush/jungle/c + icon_state = "bushc1" +/obj/structure/flora/bush/jungle/c/style_2 + icon_state = "bushc2" +/obj/structure/flora/bush/jungle/c/style_3 + icon_state = "bushc3" +/obj/structure/flora/bush/jungle/c/style_random/Initialize(mapload) + . = ..() + icon_state = "bushc[rand(1, 3)]" -/obj/structure/flora/junglebush/large - icon_state = "bush" +/obj/structure/flora/bush/large icon = 'icons/obj/flora/largejungleflora.dmi' + icon_state = "bush1" pixel_x = -16 pixel_y = -12 layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE -/obj/structure/flora/rock/pile/largejungle - name = "rocks" - icon_state = "rocks" - icon = 'icons/obj/flora/largejungleflora.dmi' +/obj/structure/flora/bush/large/style_2 + icon_state = "bush2" +/obj/structure/flora/bush/large/style_3 + icon_state = "bush3" +/obj/structure/flora/bush/large/style_random/Initialize(mapload) + . = ..() + icon_state = "bush[rand(1, 3)]" + +/********* + * Rocks * + *********/ +// (I know these aren't plants) + +/obj/structure/flora/rock + name = "large rock" + icon_state = "basalt1" + desc = "A volcanic rock. Pioneers used to ride these babies for miles." + icon = 'icons/obj/flora/rocks.dmi' + density = TRUE + resistance_flags = FIRE_PROOF + product_types = list(/obj/item/stack/ore/glass/basalt = 1) + harvest_amount_low = 10 + harvest_amount_high = 20 + harvest_message_med = "You finish mining the rock." + harvest_verb = "mine" + flora_flags = FLORA_STONE + can_uproot = FALSE + delete_on_harvest = TRUE + +/obj/structure/flora/rock/style_2 + icon_state = "basalt2" +/obj/structure/flora/rock/style_3 + icon_state = "basalt3" +/obj/structure/flora/rock/style_random/Initialize(mapload) + . = ..() + icon_state = "basalt[rand(1, 3)]" + +/obj/structure/flora/rock/pile + name = "rock pile" + desc = "A pile of rocks." + icon_state = "lavarocks1" + harvest_amount_low = 5 + harvest_amount_high = 10 + harvest_message_med = "You finish mining the pile of rocks." density = FALSE + +/obj/structure/flora/rock/pile/style_2 + icon_state = "lavarocks2" +/obj/structure/flora/rock/pile/style_3 + icon_state = "lavarocks3" +/obj/structure/flora/rock/pile/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks[rand(1, 3)]" + +/obj/structure/flora/rock/pile/jungle + icon_state = "rock1" + icon = 'icons/obj/flora/jungleflora.dmi' +/obj/structure/flora/rock/pile/jungle/style_2 + icon_state = "rock2" +/obj/structure/flora/rock/pile/jungle/style_3 + icon_state = "rock3" +/obj/structure/flora/rock/pile/jungle/style_4 + icon_state = "rock4" +/obj/structure/flora/rock/pile/jungle/style_5 + icon_state = "rock5" +/obj/structure/flora/rock/pile/jungle/style_random/Initialize(mapload) + . = ..() + icon_state = "rock[rand(1, 5)]" + +/obj/structure/flora/rock/pile/jungle/large + name = "pile of large rocks" + icon_state = "rocks1" + icon = 'icons/obj/flora/largejungleflora.dmi' pixel_x = -16 pixel_y = -16 + harvest_amount_low = 9 + harvest_amount_high = 13 -/obj/structure/flora/rock/pile/largejungle/Initialize(mapload) +/obj/structure/flora/rock/pile/jungle/large/style_2 + icon_state = "rocks2" +/obj/structure/flora/rock/pile/jungle/large/style_3 + icon_state = "rocks3" +/obj/structure/flora/rock/pile/jungle/large/style_random/Initialize(mapload) . = ..() - icon_state = "[initial(icon_state)][rand(1,3)]" + icon_state = "rocks[rand(1, 3)]" + +//TODO: Make new sprites for these. the pallete in the icons are grey, and a white color here still makes them grey +/obj/structure/flora/rock/icy + name = "icy rock" + icon_state = "basalt1" + color = rgb(204,233,235) + +/obj/structure/flora/rock/icy/style_2 + icon_state = "basalt2" +/obj/structure/flora/rock/icy/style_3 + icon_state = "basalt3" +/obj/structure/flora/rock/icy/style_random/Initialize(mapload) + . = ..() + icon_state = "basalt[rand(1, 3)]" + +/obj/structure/flora/rock/pile/icy + name = "icy rocks" + icon_state = "lavarocks1" + color = rgb(204,233,235) + +/obj/structure/flora/rock/pile/icy/style_2 + icon_state = "lavarocks2" +/obj/structure/flora/rock/pile/icy/style_3 + icon_state = "lavarocks3" +/obj/structure/flora/rock/pile/icy/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks[rand(1, 3)]" diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 0bc80f8c5ef..a8a38991ee9 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -216,7 +216,7 @@ to_chat(L, span_danger("The ground quakes beneath your feet!")) L.Paralyze(100) L.adjustBruteLoss(35) - var/obj/structure/flora/rock/giant_rock = new(get_turf(src)) + var/obj/structure/flora/rock/style_random/giant_rock = new(get_turf(src)) QDEL_IN(giant_rock, 200) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index 296e6b82541..181d05476b5 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -121,25 +121,19 @@ spawnableTurfs = list(/turf/open/misc/asteroid/snow/atmosphere = 100) /datum/map_generator_module/snow/pine_trees - spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) + spawnableAtoms = list(/obj/structure/flora/tree/pine/style_random = 30) /datum/map_generator_module/snow/dead_trees - spawnableAtoms = list(/obj/structure/flora/tree/dead = 10) + spawnableAtoms = list(/obj/structure/flora/tree/dead/style_random = 10) /datum/map_generator_module/snow/rand_bushes - spawnableAtoms = list() - -/datum/map_generator_module/snow/rand_bushes/New() - ..() - spawnableAtoms = typesof(/obj/structure/flora/ausbushes) - for(var/i in spawnableAtoms) - spawnableAtoms[i] = 1 + spawnableAtoms = list(/obj/structure/flora/bush/snow/style_random = 1) /datum/map_generator_module/snow/bunnies spawnableAtoms = list(/mob/living/simple_animal/rabbit = 0.5) /datum/map_generator_module/snow/rand_ice_rocks - spawnableAtoms = list(/obj/structure/flora/rock/icy = 5, /obj/structure/flora/rock/pile/icy = 5) + spawnableAtoms = list(/obj/structure/flora/rock/icy/style_random = 5, /obj/structure/flora/rock/pile/icy/style_random = 5) /obj/effect/landmark/map_generator/snowy mapGeneratorType = /datum/map_generator/snowy diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index a64e53ae979..5f5dc4b3ad3 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -467,19 +467,6 @@ desc = "This wand uses healing magics to heal and revive. The years of the cold have weakened the magic inside the wand." max_charges = 5 -//mobs//-- - -//ice spiders moved to giant_spiders.dm - -//objs//-- - -/obj/structure/flora/rock/icy - name = "icy rock" - color = rgb(204,233,235) - -/obj/structure/flora/rock/pile/icy - name = "icey rocks" - color = rgb(204,233,235) //decals//-- /obj/effect/turf_decal/snowdin_station_sign diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index c9dcc610a1a..c8f08877d97 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -2,27 +2,23 @@ //This includes: The structures, their produce, their seeds and the crafting recipe for the mushroom bowl /obj/structure/flora/ash - gender = PLURAL - layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot - icon = 'icons/obj/lavaland/ash_flora.dmi' - icon_state = "l_mushroom" name = "large mushrooms" desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores." - herbage = TRUE //not really accurate but what sound do hit mushrooms make anyway - var/harvested_name = "shortened mushrooms" - var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large." - var/needs_sharp_harvest = TRUE - var/harvest = /obj/item/food/grown/ash_flora/shavings - var/harvest_amount_low = 1 - var/harvest_amount_high = 3 - var/harvest_time = 60 - var/harvest_message_low = "You pick a mushroom, but fail to collect many shavings from its cap." - var/harvest_message_med = "You pick a mushroom, carefully collecting the shavings from its cap." - var/harvest_message_high = "You harvest and collect shavings from several mushroom caps." - var/harvested = FALSE + icon = 'icons/obj/lavaland/ash_flora.dmi' + icon_state = "l_mushroom" + gender = PLURAL + layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot + product_types = list(/obj/item/food/grown/ash_flora/shavings = 1) + harvest_with_hands = TRUE + harvested_name = "shortened mushrooms" + harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large." + harvest_message_low = "You pick a mushroom, but fail to collect many shavings from its cap." + harvest_message_med = "You pick a mushroom, carefully collecting the shavings from its cap." + harvest_message_high = "You harvest and collect shavings from several mushroom caps." + harvest_message_true_thresholds = TRUE + harvest_verb = "pluck" + flora_flags = FLORA_HERBAL //not really accurate but what sound do hit mushrooms make anyway var/base_icon - var/regrowth_time_low = 8 MINUTES - var/regrowth_time_high = 16 MINUTES var/number_of_variants = 4 /obj/structure/flora/ash/Initialize(mapload) @@ -30,154 +26,116 @@ base_icon = "[icon_state][rand(1, number_of_variants)]" icon_state = base_icon -/obj/structure/flora/ash/proc/harvest(user) - if(harvested) +/obj/structure/flora/ash/harvest(user) + if(!..()) return FALSE - - var/rand_harvested = rand(harvest_amount_low, harvest_amount_high) - if(rand_harvested) - if(user) - var/msg = harvest_message_med - if(rand_harvested == harvest_amount_low) - msg = harvest_message_low - else if(rand_harvested == harvest_amount_high) - msg = harvest_message_high - to_chat(user, span_notice("[msg]")) - for(var/i in 1 to rand_harvested) - new harvest(get_turf(src)) - icon_state = "[base_icon]p" - name = harvested_name - desc = harvested_desc - harvested = TRUE - addtimer(CALLBACK(src, .proc/regrow), rand(regrowth_time_low, regrowth_time_high)) return TRUE -/obj/structure/flora/ash/proc/regrow() +/obj/structure/flora/ash/regrow() + ..() icon_state = base_icon - name = initial(name) - desc = initial(desc) - harvested = FALSE - -/obj/structure/flora/ash/attackby(obj/item/W, mob/user, params) - if(!harvested && needs_sharp_harvest && W.get_sharpness()) - user.visible_message(span_notice("[user] starts to harvest from [src] with [W]."),span_notice("You begin to harvest from [src] with [W].")) - if(do_after(user, harvest_time, target = src)) - harvest(user) - else - return ..() - -/obj/structure/flora/ash/attack_hand(mob/user, list/modifiers) - . = ..() - if(.) - return - if(!harvested && !needs_sharp_harvest) - user.visible_message(span_notice("[user] starts to harvest from [src]."),span_notice("You begin to harvest from [src].")) - if(do_after(user, harvest_time, target = src)) - harvest(user) /obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things regrowth_time_low = 4200 /obj/structure/flora/ash/leaf_shroom - icon_state = "s_mushroom" name = "leafy mushrooms" desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures." + icon_state = "s_mushroom" + product_types = list(/obj/item/food/grown/ash_flora/mushroom_leaf = 1) harvested_name = "leafless mushrooms" harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?" - harvest = /obj/item/food/grown/ash_flora/mushroom_leaf - needs_sharp_harvest = FALSE harvest_amount_high = 4 - harvest_time = 20 harvest_message_low = "You pluck a single, suitable leaf." harvest_message_med = "You pluck a number of leaves, leaving a few unsuitable ones." harvest_message_high = "You pluck quite a lot of suitable leaves." + harvest_time = 20 regrowth_time_low = 2400 regrowth_time_high = 6000 /obj/structure/flora/ash/cap_shroom - icon_state = "r_mushroom" name = "tall mushrooms" desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems." + icon_state = "r_mushroom" + product_types = list(/obj/item/food/grown/ash_flora/mushroom_cap = 1) harvested_name = "small mushrooms" harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms." - harvest = /obj/item/food/grown/ash_flora/mushroom_cap harvest_amount_high = 4 - harvest_time = 50 harvest_message_low = "You slice the cap off a mushroom." harvest_message_med = "You slice off a few conks from the larger mushrooms." harvest_message_high = "You slice off a number of caps and conks from these mushrooms." + harvest_time = 50 regrowth_time_low = 3000 regrowth_time_high = 5400 /obj/structure/flora/ash/stem_shroom - icon_state = "t_mushroom" name = "numerous mushrooms" desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!" + icon_state = "t_mushroom" light_range = 1.5 light_power = 2.1 + product_types = list(/obj/item/food/grown/ash_flora/mushroom_stem = 1) harvested_name = "tiny mushrooms" harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back." - harvest = /obj/item/food/grown/ash_flora/mushroom_stem harvest_amount_high = 4 - harvest_time = 40 harvest_message_low = "You pick and slice the cap off a mushroom, leaving the stem." harvest_message_med = "You pick and decapitate several mushrooms for their stems." harvest_message_high = "You acquire a number of stems from these mushrooms." + harvest_time = 40 regrowth_time_low = 3000 regrowth_time_high = 6000 /obj/structure/flora/ash/cacti - icon_state = "cactus" name = "fruiting cacti" desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash." + icon_state = "cactus" + product_types = list(/obj/item/food/grown/ash_flora/cactus_fruit = 20, /obj/item/seeds/lavaland/cactus = 1) harvested_name = "cacti" harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash." - harvest = /obj/item/food/grown/ash_flora/cactus_fruit - needs_sharp_harvest = FALSE harvest_amount_high = 2 - harvest_time = 10 harvest_message_low = "You pick a cactus fruit." harvest_message_med = "You pick several cactus fruit." //shouldn't show up, because you can't get more than two harvest_message_high = "You pick a pair of cactus fruit." + harvest_time = 10 regrowth_time_low = 4800 regrowth_time_high = 7200 + can_uproot = FALSE //Don't want 50 in one tile to decimate whoever dare step on the mass of cacti /obj/structure/flora/ash/cacti/Initialize(mapload) . = ..() AddComponent(/datum/component/caltrop, min_damage = 3, max_damage = 6, probability = 70) /obj/structure/flora/ash/seraka - icon_state = "seraka_mushroom" name = "seraka mushrooms" desc = "A small cluster of seraka mushrooms. These must have come with the ashlizards." - needs_sharp_harvest = FALSE + icon_state = "seraka_mushroom" + product_types = list(/obj/item/food/grown/ash_flora/seraka = 1) harvested_name = "harvested seraka mushrooms" harvested_desc = "A couple of small seraka mushrooms, with the larger ones clearly having been recently removed. They'll grow back... eventually." - harvest = /obj/item/food/grown/ash_flora/seraka harvest_amount_high = 6 - harvest_time = 25 harvest_message_low = "You pluck a few choice tasty mushrooms." harvest_message_med = "You grab a good haul of mushrooms." harvest_message_high = "You hit the mushroom motherlode and make off with a bunch of tasty mushrooms." + harvest_time = 25 regrowth_time_low = 3000 regrowth_time_high = 5400 number_of_variants = 2 + harvest_message_true_thresholds = FALSE ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly - icon_state = "chilly_pepper" name = "springy grassy fruit" desc = "A number of bright, springy blue fruiting plants. They seem to be unconcerned with the hardy, cold environment." + icon_state = "chilly_pepper" + product_types = list(/obj/item/food/grown/icepepper = 1) harvested_name = "springy grass" harvested_desc = "A bunch of springy, bouncy fruiting grass, all picked. Or maybe they were never fruiting at all?" - harvest = /obj/item/food/grown/icepepper - needs_sharp_harvest = FALSE harvest_amount_high = 3 - harvest_time = 15 harvest_message_low = "You pluck a single, curved fruit." harvest_message_med = "You pluck a number of curved fruit." harvest_message_high = "You pluck quite a lot of curved fruit." + harvest_time = 15 regrowth_time_low = 2400 regrowth_time_high = 5500 number_of_variants = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 8d77efc2a55..83d7c5aab5e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -363,14 +363,14 @@ NewTerrainWalls = /turf/closed/wall/mineral/wood NewTerrainChairs = /obj/structure/chair/wood NewTerrainTables = /obj/structure/table/glass - NewFlora = list(/obj/structure/flora/grass/green, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/both) + NewFlora = list(/obj/structure/flora/grass/green/style_random, /obj/structure/flora/grass/brown/style_random, /obj/structure/flora/grass/both/style_random) if("jungle") //Beneficial due to actually having breathable air. Plus, monkeys and bows and arrows. NewTerrainFloors = /turf/open/floor/grass NewTerrainWalls = /turf/closed/wall/mineral/wood NewTerrainChairs = /obj/structure/chair/wood NewTerrainTables = /obj/structure/table/wood - NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush, - /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/species/monkey) + NewFlora = list(/obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/leavy/style_random, + /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/bush/sunny/style_random, /obj/structure/flora/tree/palm/style_random, /mob/living/carbon/human/species/monkey) florachance = 20 if("ayy lmao") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos. NewTerrainFloors = /turf/open/floor/plating/abductor diff --git a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm index 1f9cc5f1e90..43384295772 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm @@ -4,11 +4,11 @@ //Pine Trees /datum/map_generator_module/pine_trees - spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) + spawnableAtoms = list(/obj/structure/flora/tree/pine/style_random = 30) //Dead Trees /datum/map_generator_module/dead_trees - spawnableAtoms = list(/obj/structure/flora/tree/dead = 10) + spawnableAtoms = list(/obj/structure/flora/tree/dead/style_random = 10) //Random assortment of bushes /datum/map_generator_module/rand_bushes @@ -16,14 +16,14 @@ /datum/map_generator_module/rand_bushes/New() ..() - spawnableAtoms = typesof(/obj/structure/flora/ausbushes) + spawnableAtoms = typesof(/obj/structure/flora/bush) - typesof(/obj/structure/flora/bush/snow) for(var/i in spawnableAtoms) spawnableAtoms[i] = 20 //Random assortment of rocks and rockpiles /datum/map_generator_module/rand_rocks - spawnableAtoms = list(/obj/structure/flora/rock = 40, /obj/structure/flora/rock/pile = 20) + spawnableAtoms = list(/obj/structure/flora/rock/style_random = 40, /obj/structure/flora/rock/pile/style_random = 20) //Grass turfs @@ -34,4 +34,4 @@ //Grass tufts with a high spawn chance /datum/map_generator_module/dense_layer/grass_tufts spawnableTurfs = list() - spawnableAtoms = list(/obj/structure/flora/ausbushes/grassybush = 75) + spawnableAtoms = list(/obj/structure/flora/bush/grassy/style_random = 75) diff --git a/tgstation.dme b/tgstation.dme index 1f7009d1bc6..d4afb1b375d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -78,6 +78,7 @@ #include "code\__DEFINES\fantasy_affixes.dm" #include "code\__DEFINES\firealarm.dm" #include "code\__DEFINES\flags.dm" +#include "code\__DEFINES\flora.dm" #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\food.dm" #include "code\__DEFINES\footsteps.dm" @@ -1489,6 +1490,7 @@ #include "code\game\objects\items\hourglass.dm" #include "code\game\objects\items\inducer.dm" #include "code\game\objects\items\inspector.dm" +#include "code\game\objects\items\kirbyplants.dm" #include "code\game\objects\items\kitchen.dm" #include "code\game\objects\items\knives.dm" #include "code\game\objects\items\latexballoon.dm"