diff --git a/baystation12.dme b/baystation12.dme index a60126320f6..5f454353a05 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1051,7 +1051,6 @@ #include "code\game\objects\effects\item_pickup_ghost.dm" #include "code\game\objects\effects\landmarks.dm" #include "code\game\objects\effects\manifest.dm" -#include "code\game\objects\effects\mines.dm" #include "code\game\objects\effects\misc.dm" #include "code\game\objects\effects\overlays.dm" #include "code\game\objects\effects\portals.dm" @@ -1361,6 +1360,7 @@ #include "code\game\objects\structures\lamarr.dm" #include "code\game\objects\structures\lattice.dm" #include "code\game\objects\structures\loot_piles.dm" +#include "code\game\objects\structures\mines.dm" #include "code\game\objects\structures\mirror.dm" #include "code\game\objects\structures\mop_bucket.dm" #include "code\game\objects\structures\morgue.dm" @@ -2046,7 +2046,6 @@ #include "code\modules\locks\lock_construct.dm" #include "code\modules\mapgen\_biome.dm" #include "code\modules\mapgen\_MapGenerator.dm" -#include "code\modules\mapgen\_testing.dm" #include "code\modules\mapgen\SingleTurf.dm" #include "code\modules\mapgen\Whitesandsatmos.dm" #include "code\modules\mapgen\atmosphere\_atmosphere.dm" diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 5c3c007869d..45fb5fb359f 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -17,3 +17,14 @@ if(victim == O) return 0 return 1 + +/obj/effect/minefield + name = "minefield" + var/minerange = 9 + var/minetype = /obj/structure/landmine + +/obj/effect/minefield/Initialize() + . = ..() + for(var/turf/simulated/floor/T in view(minerange,loc)) + if(prob(5)) + new minetype(T) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 1651d96a9b0..be619667d74 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -36,6 +36,15 @@ qdel(src) return +/obj/structure/flora/tree/palm + name = "Palm tree" + icon = 'icons/misc/beach2.dmi' + icon_state = "palm1" + +/obj/structure/flora/tree/palm/Initialize() + . = ..() + icon_state = "palm[rand(1, 2)]" + /obj/structure/flora/tree/pine name = "pine tree" icon = 'icons/obj/flora/pinetrees.dmi' @@ -45,6 +54,11 @@ ..() icon_state = "pine_[rand(1, 3)]" +/obj/structure/flora/tree/pine/dead + name = "dead pine" + icon = 'icons/obj/flora/aridtrees.dmi' + icon_state = "med_pine_dead" + /obj/structure/flora/tree/pine/xmas name = "xmas tree" icon = 'icons/obj/flora/pinetrees.dmi' @@ -102,9 +116,27 @@ ..() icon_state = "tree_[rand(1, 12)]" -/obj/structure/flora/tree/tall/New() - icon_state = "tree_[rand(1,6)]" - ..() +/obj/structure/flora/tree/dead/tall/grey + name = "petrified trunk" + desc = "An ancient tree was carbonized in fire and ash. Only a skeleton remains." + icon = 'icons/obj/flora/tall_trees_dead.dmi' + icon_state = "tree1" + +/obj/structure/flora/tree/dead/tall/grey/Initialize() + . = ..() + icon_state = "tree[rand(1, 3)]" + +/obj/structure/flora/tree/dead/barren + name = "petrified tree" + desc = "An ancient trunk, mummified by the passage of time. This one still has some purple to it." + color = "#846996" + icon = 'icons/obj/flora/barren_tree.dmi' + icon_state = "barren_large" + +/obj/structure/flora/tree/dead/barren/Initialize() + . = ..() + color = pick( "#846996", "#7b4e99", "#924fab") + icon_state = "barren_large" /obj/structure/flora/tree/pine/old_pinteree name = "xmas tree" @@ -152,6 +184,13 @@ /obj/structure/flora/tree/green/tree10 icon_state = "tree10" +/obj/structure/flora/tree/green/random + icon_state = "tree1" + +/obj/structure/flora/tree/green/random/Initialize() + . = ..() + icon_state = "tree[rand(1, 10)]" + /obj/structure/flora/tree/green/spook1 icon_state = "spook1" @@ -214,35 +253,91 @@ /obj/structure/flora/tree/green/small/tree6 icon_state = "tree6" +/obj/structure/flora/tree/green/small/random + icon_state = "tree1" + +/obj/structure/flora/tree/green/small/random/Initialize() + . = ..() + icon_state = "tree[rand(1, 6)]" + +/obj/structure/flora/tree/cactus + name = "cactus" + pixel_y = 0 + icon = 'icons/obj/flora/aridtrees.dmi' + icon_state = "cactus1" + cut_hits = 10 + +/obj/structure/flora/tree/cactus/Initialize() + . = ..() + icon_state = "cactus[rand(1, 4)]" + //grass -/obj/structure/flora/grass +/obj/structure/flora/grass/snowy name = "grass" icon = 'icons/obj/flora/snowflora.dmi' anchored = 1 layer = BELOW_DOOR_LAYER -/obj/structure/flora/grass/brown +/obj/structure/flora/grass/snowy/brown icon_state = "snowgrass1bb" -/obj/structure/flora/grass/brown/New() +/obj/structure/flora/grass/snowy/brown/New() ..() icon_state = "snowgrass[rand(1, 3)]bb" - -/obj/structure/flora/grass/green +/obj/structure/flora/grass/snowy/green icon_state = "snowgrass1gb" -/obj/structure/flora/grass/green/New() +/obj/structure/flora/grass/snowy/green/New() ..() icon_state = "snowgrass[rand(1, 3)]gb" -/obj/structure/flora/grass/both +/obj/structure/flora/grass/snowy/both icon_state = "snowgrassall1" -/obj/structure/flora/grass/both/New() +/obj/structure/flora/grass/snowy/both/New() ..() icon_state = "snowgrassall[rand(1, 3)]" +/obj/structure/flora/grass/rockplanet + name = "cottongrass" + desc= "A variety of cold-loving prarie grass. This variety seems to thrive the frigid rockworld enviroment, so long as water can be found nearby." + icon = 'icons/obj/flora/grasssticks.dmi' + icon_state = "tall_grass_1" + anchored = 1 + layer = BELOW_DOOR_LAYER + +/obj/structure/flora/grass/rockplanet/Initialize() + . = ..() + icon_state = "tall_grass_[rand(1, 2)]" + +/obj/structure/flora/grass/rockplanet/dead + name = "dry cottongrass" + desc= "This patch seems to have run dry on life-giving water." + icon_state = "dry_grass_1" + +/obj/structure/flora/grass/rockplanet/dead/Initialize() + . = ..() + icon_state = "dry_grass_[rand(1, 2)]" + +/obj/structure/flora/driftwood + name = "driftwood" + desc = "Floatsam, jetsam, all molded down in the unforgiving sea." + icon = 'icons/obj/flora/grasssticks.dmi' + icon_state = "stick2" + base_icon_state = "stick" + density = 0 + +/obj/structure/flora/driftwood/Initialize() + . = ..() + icon_state = "stick[rand(1, 4)]" + +/obj/structure/flora/driftlog + name = "driftwood log" + desc = "Better log this one in the database." + icon = 'icons/obj/flora/grasssticks.dmi' + icon_state = "dry_log" + density = 0 //bushes /obj/structure/flora/bush @@ -474,6 +569,62 @@ ..() icon_state = "fullgrass_[rand(1, 3)]" +/obj/structure/flora/ausbushes/hell + name = "hell bush" + icon = 'icons/obj/flora/hellflora.dmi' + icon_state = "firstbush_1" + +/obj/structure/flora/ausbushes/hell/Initialize() + . = ..() + icon_state = "firstbush_[rand(1, 4)]" + +/obj/structure/flora/ausbushes/hell/grassybush + icon_state = "grassybush_1" + +/obj/structure/flora/ausbushes/hell/grassybush/Initialize() + . = ..() + icon_state = "grassybush_[rand(1, 4)]" + +/obj/structure/flora/ausbushes/hell/fernybush + icon_state = "fernybush_1" + +/obj/structure/flora/ausbushes/hell/fernybush/Initialize() + . = ..() + icon_state = "fernybush_[rand(1, 3)]" + +/obj/structure/flora/ausbushes/hell/genericbush + icon_state = "genericbush_1" + +/obj/structure/flora/ausbushes/hell/genericbush/Initialize() + . = ..() + icon_state = "genericbush_[rand(1, 4)]" + +/obj/structure/flora/ausbushes/hell/ywflowers + icon_state = "ywflowers_1" + +/obj/structure/flora/ausbushes/hell/ywflowers/Initialize() + . = ..() + icon_state = "ywflowers_[rand(1, 4)]" + +/obj/structure/flora/ausbushes/hell/sparsegrass + icon_state = "sparsegrass_1" + +/obj/structure/flora/ausbushes/hell/sparsegrass/Initialize() + . = ..() + icon_state = "sparsegrass_[rand(1, 3)]" + +/obj/structure/flora/ausbushes/hell/fullgrass + icon_state = "fullgrass_1" + +/obj/structure/flora/ausbushes/hell/fullgrass/Initialize() + . = ..() + icon_state = "fullgrass_[rand(1, 3)]" + +/obj/structure/flora/ausbushes/hell/firebush + name = "flaming bush" + desc = "A bush being consumed by flames. Maybe it'll rise from its ashes like a phoenix?" + icon_state = "hell_bush" + /obj/structure/flora/ausbushes/jungleflora icon = 'icons/obj/flora/jungleflora.dmi' icon_state = "busha" @@ -481,40 +632,81 @@ /obj/structure/flora/ausbushes/jungleflora/busha icon_state = "busha" -/obj/structure/flora/ausbushes/jungleflora/busha/New() - ..() +/obj/structure/flora/ausbushes/jungleflora/busha/Initialize() + . = ..() icon_state = "busha[rand(1, 3)]" /obj/structure/flora/ausbushes/jungleflora/bushb icon_state = "bushb" -/obj/structure/flora/ausbushes/jungleflora/bushb/New() - ..() +/obj/structure/flora/ausbushes/jungleflora/bushb/Initialize() + . = ..() icon_state = "bushb[rand(1, 3)]" /obj/structure/flora/ausbushes/jungleflora/bushc icon_state = "bushc" -/obj/structure/flora/ausbushes/jungleflora/bushc/New() - ..() +/obj/structure/flora/ausbushes/jungleflora/bushc/Initialize() + . = ..() icon_state = "bushc[rand(1, 3)]" /obj/structure/flora/ausbushes/jungleflora/grassa name = "grass" icon_state = "grassa" -/obj/structure/flora/ausbushes/jungleflora/grassa/New() - ..() +/obj/structure/flora/ausbushes/jungleflora/grassa/Initialize() + . = ..() icon_state = "grassa[rand(1, 5)]" /obj/structure/flora/ausbushes/jungleflora/grassb name = "grass" icon_state = "grassb" -/obj/structure/flora/ausbushes/jungleflora/grassb/New() - ..() +/obj/structure/flora/ausbushes/jungleflora/grassb/Initialize() + . = ..() icon_state = "grassb[rand(1, 5)]" +/obj/structure/flora/ausbushes/jungleflora/large + icon_state = "bush" + icon = 'icons/obj/flora/largejungleflora.dmi' + pixel_x = -16 + pixel_y = -12 + layer = ABOVE_HUMAN_LAYER + +/obj/structure/flora/ausbushes/jungleflora/large/bush1 + icon_state = "bush1" + +/obj/structure/flora/ausbushes/jungleflora/large/bush2 + icon_state = "bush2" + +/obj/structure/flora/ausbushes/jungleflora/large/bush3 + icon_state = "bush3" + +/obj/structure/flora/ausbushes/jungleflora/large/Initialize() + . = ..() + icon_state = "bush[rand(1, 3)]" + +/obj/structure/flora/jungleflora/rock + name = "rock" + icon_state = "rock" + icon = 'icons/obj/flora/jungleflora.dmi' + anchored = 1 + layer = BELOW_DOOR_LAYER + +/obj/structure/flora/jungleflora/rock/Initialize() + . = ..() + icon_state = "rock[rand(1, 5)]" + +/obj/structure/flora/jungleflora/rock/large + icon_state = "rocks" + icon = 'icons/obj/flora/largejungleflora.dmi' + pixel_x = -16 + pixel_y = -16 + +/obj/structure/flora/jungleflora/rock/large/Initialize() + . = ..() + icon_state = "rocks[rand(1, 3)]" + /obj/structure/flora/goonbushes name = "shrub" icon = 'icons/obj/flora/goonbushes.dmi' @@ -581,7 +773,7 @@ /obj/structure/flora/junglevines/light/New() if(rand_state) - icon_state = "light[rand(0, 2)]" + icon_state = "light[rand(1, 3)]" ..() /obj/structure/flora/junglevines/light/CanPass(atom/movable/mover, turf/target) @@ -593,8 +785,29 @@ return prob(30) return TRUE +/obj/structure/flora/junglevines/medium + icon_state = "medium1" + desc = "A dense mass of twisted vines." + cut_level = PLANT_CUT + cut_hits = 6 + var/rand_state = TRUE + +/obj/structure/flora/junglevines/medium/New() + if(rand_state) + icon_state = "medium[rand(1, 3)]" + ..() + +/obj/structure/flora/junglevines/medium/CanPass(atom/movable/mover, turf/target) + if(istype(mover, /mob/living)) + if(prob(40)) + to_chat(mover, "You get stuck in \the [src] for a moment.") + return FALSE + else if(istype(mover, /obj/item/projectile)) + return prob(30) + return TRUE + /obj/structure/flora/junglevines/heavy - icon_state = "heavy0" + icon_state = "heavy1" desc = "A thick, coiled mass of twisted vines." opacity = 1 cut_level = PLANT_CUT @@ -603,7 +816,7 @@ /obj/structure/flora/junglevines/heavy/New() if(rand_state) - icon_state = "heavy[rand(0, 5)]" + icon_state = "heavy[rand(1, 3)]" ..() /obj/structure/flora/junglevines/heavy/CanPass(atom/movable/mover, turf/target) @@ -665,25 +878,6 @@ name = "bush" icon_state = "junglebush3" -/obj/structure/flora/jungleplants/junglebushlarge - name = "bush" - icon = 'icons/obj/flora/junglebushlarge.dmi' - icon_state = "bush1" - pixel_x = -16 - pixel_y = -8 - -/obj/structure/flora/jungleplants/junglebushlarge/bush1 - icon_state = "bush1" - -/obj/structure/flora/jungleplants/junglebushlarge/bush2 - icon_state = "bush2" - -/obj/structure/flora/jungleplants/junglebushlarge/bush3 - icon_state = "bush3" - -/obj/structure/flora/jungleplants/junglebushlarge/bush4 - icon_state = "bush4" - /obj/structure/flora/jungleplants/alienplant1 name = "alien plant" icon_state = "alienplant1" diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/structures/mines.dm similarity index 76% rename from code/game/objects/effects/mines.dm rename to code/game/objects/structures/mines.dm index 53ddb2a7e49..ae0cd990f74 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/structures/mines.dm @@ -1,4 +1,4 @@ -/obj/effect/mine +/obj/structure/landmine name = "Mine" desc = "I Better stay away from that thing." density = 1 @@ -9,13 +9,13 @@ var/triggerproc = "explode" //name of the proc thats called when the mine is triggered var/triggered = 0 -/obj/effect/mine/New() +/obj/structure/landmine/New() icon_state = "uglyminearmed" -/obj/effect/mine/Crossed(AM as mob|obj) +/obj/structure/landmine/Crossed(AM as mob|obj) Bumped(AM) -/obj/effect/mine/Bumped(mob/M as mob|obj) +/obj/structure/landmine/Bumped(mob/M as mob|obj) if(triggered) return @@ -25,7 +25,7 @@ triggered = 1 call(src,triggerproc)(M) -/obj/effect/mine/proc/triggerrad(obj) +/obj/structure/landmine/proc/triggerrad(obj) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() @@ -33,7 +33,7 @@ spawn(0) qdel(src) -/obj/effect/mine/proc/triggerstun(obj) +/obj/structure/landmine/proc/triggerstun(obj) if(ismob(obj)) var/mob/M = obj M.Stun(30) @@ -43,7 +43,7 @@ spawn(0) qdel(src) -/obj/effect/mine/proc/triggern2o(obj) +/obj/structure/landmine/proc/triggern2o(obj) //example: n2o triggerproc //note: im lazy @@ -54,7 +54,7 @@ spawn(0) qdel(src) -/obj/effect/mine/proc/triggerplasma(obj) +/obj/structure/landmine/proc/triggerplasma(obj) for (var/turf/simulated/floor/target in range(1,src)) if(!target.blocks_air) target.assume_gas("plasma", 30) @@ -64,7 +64,7 @@ spawn(0) qdel(src) -/obj/effect/mine/proc/triggerkick(obj) +/obj/structure/landmine/proc/triggerkick(obj) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() @@ -72,32 +72,32 @@ spawn(0) qdel(src) -/obj/effect/mine/proc/explode(obj) +/obj/structure/landmine/proc/explode(obj) explosion(loc, 1, 2, 3, 4) spawn(0) qdel(src) -/obj/effect/mine/dnascramble +/obj/structure/landmine/dnascramble name = "Radiation Mine" icon_state = "uglymine" triggerproc = "triggerrad" -/obj/effect/mine/plasma +/obj/structure/landmine/plasma name = "Plasma Mine" icon_state = "uglymine" triggerproc = "triggerplasma" -/obj/effect/mine/kick +/obj/structure/landmine/kick name = "Kick Mine" icon_state = "uglymine" triggerproc = "triggerkick" -/obj/effect/mine/n2o +/obj/structure/landmine/n2o name = "N2O Mine" icon_state = "uglymine" triggerproc = "triggern2o" -/obj/effect/mine/stun +/obj/structure/landmine/stun name = "Stun Mine" icon_state = "uglymine" triggerproc = "triggerstun" diff --git a/code/game/objects/structures/rock.dm b/code/game/objects/structures/rock.dm index 5ea933d4290..fff6686ffbc 100644 --- a/code/game/objects/structures/rock.dm +++ b/code/game/objects/structures/rock.dm @@ -2,17 +2,17 @@ name = "huge rock" desc = "Huge rocky chunk of asteroid minerals." icon = 'icons/turf/asteroid.dmi' - icon_state = "asteroid_bigstone1" + icon_state = "big_asteroid1" opacity = 0 density = 1 anchored = 1 - var/list/iconlist = list("asteroid_bigstone1","asteroid_bigstone2","asteroid_bigstone3","asteroid_bigstone4") + var/list/iconlist = list("big_asteroid1","big_asteroid2","big_asteroid3","big_asteroid4") var/health = 40 var/last_act = 0 -/obj/structure/rock/New() - ..() - icon_state = pick(iconlist) +/obj/structure/rock/Initialize() + . = ..() + icon_state = "big_asteroid[rand(1, 4)]" /obj/structure/rock/add_debris_element() AddElement(/datum/element/debris, DEBRIS_ROCK, -10, 5, 1) @@ -67,3 +67,93 @@ var/obj/mecha/M = AM if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill)) M.selected.action(src) + +/obj/structure/rock/basalt + name = "basalt" + desc = "Huge chunk of gray rock that contain various minerals." + icon_state = "big_basalt1" + +/obj/structure/rock/basalt/Initialize() + . = ..() + icon_state = "big_basalt[rand(1, 3)]" + +/obj/structure/rock/basalt/pile + name = "lava rocks" + desc = "Small pile of grey rocks that contain various minerals." + icon_state = "pile_basalt1" + density = 0 + +/obj/structure/rock/basalt/pile/Initialize() + . = ..() + icon_state = "pile_basalt[rand(1, 3)]" + +/obj/structure/rock/rockplanet + name = "russet stone" + desc = "A raised knurl of red rock." + icon_state = "big_red1" + +/obj/structure/rock/rockplanet/Initialize() + . = ..() + icon_state = "big_red[rand(1, 3)]" + +/obj/structure/rock/rockplanet/Destroy() + var/mineralSpawnChanceList = list(glass = 10) + if(prob(20)) + var/mineral_name = util_pick_weight(mineralSpawnChanceList) //temp mineral name + mineral_name = lowertext(mineral_name) + var/ore = text2path("/obj/item/ore/[mineral_name]") + for(var/i=1,i <= rand(2,6),i++) + new ore(get_turf(src)) + return ..() + +/obj/structure/rock/rockplanet/pile + name = "russet stones" + desc = "A pile of rust-red rocks." + icon_state = "plie_red1" + density = 0 + +/obj/structure/rock/rockplanet/pile/Initialize() + . = ..() + icon_state = "pile_red[rand(1, 3)]" + +/obj/structure/rock/icy + name = "icy rock" + icon_state = "big_icy1" + +/obj/structure/rock/icy/Initialize() + . = ..() + icon_state = "big_icy[rand(1, 3)]" + +/obj/structure/rock/icy/pile + name = "icy rock" + icon_state = "pile_icy1" + density = 0 + +/obj/structure/rock/lava + name = "lavatic rock" + desc = "A volcanic rock. Lava is gushing from it." + icon_state = "big_lava1" + +/obj/structure/rock/lava/Initialize() + . = ..() + icon_state = "big_lava[rand(1, 3)]" + +/obj/structure/rock/lava/pile + name = "rock shards" + desc = "Jagged shards of volcanic rock protuding from the ground." + icon_state = "pile_lava1" + density = 0 + +/obj/structure/rock/lava/pile/Initialize() + . = ..() + icon_state = "pile_lava[rand(1, 3)]" + +/obj/structure/rock/pile + name = "pebbles" + desc = "Some small pebbles, sheared off a larger rock." + icon_state = "asteroid1" + density = 0 + +/obj/structure/rock/pile/Initialize() + . = ..() + icon_state = "pile_asteroid[rand(1, 10)]" diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index e5cb99c1058..5df0a68aebe 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -424,7 +424,7 @@ /turf/simulated/floor/natural/ice name = "ice" - icon = 'icons/turf/snow.dmi' + icon = 'icons/turf/snow.dmi' //there is better textures at icons/turf/ice.dmi icon_state = "ice" footstep_sound = SFX_FOOTSTEP_SNOW @@ -501,6 +501,24 @@ ..() AddOverlays(image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1)) +/turf/simulated/floor/natural/ice/iceberg + name = "ice sheet" + desc = "A sheet of solid ice. Looks slippery." + icon = 'icons/turf/planetsnow.dmi' + icon_state = "ice1" + var/floor_variance = 100 + +/turf/simulated/floor/natural/ice/iceberg/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "ice[rand(1, 8)]" + +/turf/simulated/floor/natural/ice/fancy + name = "ice sheet" + desc = "A sheet of solid ice. Looks slippery." + icon = 'icons/turf/planetsnow.dmi' + icon_state = "ice" + //JUNGLE /turf/simulated/floor/natural/jungle diff --git a/code/modules/mapgen/_testing.dm b/code/modules/mapgen/_testing.dm deleted file mode 100644 index 1f505c01f0b..00000000000 --- a/code/modules/mapgen/_testing.dm +++ /dev/null @@ -1,37 +0,0 @@ -/client/proc/test_mapgen() - set category = "Debug" - set name = "Test Mapgenerator" - - if(!check_rights(R_DEBUG)) - return - - var/datum/map_template/empty127/empty = new /datum/map_template/empty127() - var/turf/center = empty.load_new_z() - // We can not directly get spawned atoms from load_new_z() as there we must account for bounds. - var/list/spawned = block( - locate(0 + world.view, 0 + world.view, center.z), - locate(127 - world.view, 127 - world.view, center.z) - ) - - var/datum/map_template/mining_outpost/outpost = new /datum/map_template/mining_outpost() - var/turf/ruin_turf = locate( - rand(0 + world.view, 127 - outpost.height - world.view), - rand(0 + world.view, 127 - outpost.width - world.view), - center.z - ) - outpost.load(ruin_turf) - - var/datum/map_generator/mapgen = new /datum/map_generator/planet_generator/swamp() - mapgen.generate_turfs(spawned) - mapgen.populate_turfs(spawned) - - //new /datum/random_map/automata/cave_system(null, 1, 1, center.z, 127, 127) - -/datum/map_template/empty127 - mappaths = list('maps/templates/empty_127.dmm') - returns_created_atoms = TRUE - - - -/area/testoutpost - area_flags = AREA_FLAG_UNIQUE_AREA diff --git a/code/modules/mapgen/planetary/AsteroidGenerator.dm b/code/modules/mapgen/planetary/AsteroidGenerator.dm index 96c69e7dd2d..2b136dd768a 100644 --- a/code/modules/mapgen/planetary/AsteroidGenerator.dm +++ b/code/modules/mapgen/planetary/AsteroidGenerator.dm @@ -124,9 +124,7 @@ /datum/biome/cave/asteroid/vanilla flora_spawn_list = list( - //obj/structure/flora/ash/space/voidmelon = 1, /obj/structure/rock = 1, - //obj/structure/flora/rock/pile = 1 ) feature_spawn_list = list( @@ -170,7 +168,6 @@ ) flora_spawn_list = list( - //VOIDMELON /obj/structure/rock = 1, ) diff --git a/code/modules/mapgen/planetary/BeachGenerator.dm b/code/modules/mapgen/planetary/BeachGenerator.dm index 1366268aa06..83258108dd3 100644 --- a/code/modules/mapgen/planetary/BeachGenerator.dm +++ b/code/modules/mapgen/planetary/BeachGenerator.dm @@ -81,9 +81,9 @@ ) /datum/biome/grass - open_turf_types = list(/turf/open/floor/plating/grass/beach/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach/grass = 1) flora_spawn_list = list( - /obj/structure/flora/tree/green = 1, + /obj/structure/flora/tree/green/random = 1, /obj/structure/flora/ausbushes/brflowers = 1, /obj/structure/flora/ausbushes/fernybush = 1, /obj/structure/flora/ausbushes/fullgrass = 1, @@ -100,22 +100,18 @@ /obj/structure/flora/ausbushes/stalkybush = 1, /obj/structure/flora/ausbushes/sunnybush = 1, /obj/structure/flora/ausbushes/ywflowers = 1, - //obj/structure/flora/ash/garden = 1, + /obj/structure/flora/tree/palm = 1, ) flora_spawn_chance = 25 mob_spawn_list = list( - //mob/living/simple_animal/butterfly = 1, - //mob/living/simple_animal/chicken/rabbit/normal = 1, /mob/living/simple_animal/mouse = 1, /mob/living/simple_animal/cow = 1, - //mob/living/simple_animal/deer = 1 ) mob_spawn_chance = 1 /datum/biome/grass/dense flora_spawn_chance = 70 mob_spawn_list = list( - /mob/living/simple_animal/butterfly = 4, /mob/living/simple_animal/hostile/retaliate/poison/snake = 5, /mob/living/simple_animal/hostile/poison/bees = 3, @@ -124,46 +120,50 @@ feature_spawn_chance = 0.1 /datum/biome/beach - open_turf_types = list(/turf/open/floor/plating/asteroid/sand/lit = 1) - mob_spawn_list = list(/mob/living/simple_animal/crab = 7, /mob/living/simple_animal/hostile/asteroid/lobstrosity/beach = 5) + open_turf_types = list(/turf/simulated/floor/asteroid/beach = 1) + mob_spawn_list = list( + /mob/living/simple_animal/crab = 7, + /mob/living/simple_animal/hostile/asteroid/lobstrosity/beach = 5 + ) mob_spawn_chance = 1 flora_spawn_list = list( /obj/structure/flora/tree/palm = 1, - /obj/structure/flora/rock/beach = 3, + /obj/structure/rock/basalt = 3, /obj/structure/flora/driftwood = 3, /obj/structure/flora/driftlog = 1, - /obj/item/toy/seashell = 1, ) flora_spawn_chance = 5 /datum/biome/beach/dense - open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach = 1) flora_spawn_list = list( - /obj/structure/flora/rock/asteroid = 6, - /obj/structure/flora/rock/beach = 2, + /obj/structure/rock/pile = 6, + /obj/structure/rock/basalt = 2, /obj/structure/flora/driftwood = 6, - /obj/item/toy/seashell = 1, /obj/structure/flora/driftlog = 2 ) flora_spawn_chance = 2 /datum/biome/ocean - open_turf_types = list(/turf/open/water/beach = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach/water = 1) flora_spawn_list = list( - /obj/structure/flora/rock/beach = 1, - /obj/structure/flora/rock/pile = 1, - /obj/structure/flora/ash/garden/seaweed = 1 + /obj/structure/rock/basalt = 1, + /obj/structure/basalt/pile = 1, ) flora_spawn_chance = 1 /datum/biome/ocean/deep - open_turf_types = list(/turf/open/water/beach/deep = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach/water = 1) /datum/biome/cave/beach - open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1) - closed_turf_types = list(/turf/closed/mineral/random/beach = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach = 1) + closed_turf_types = list(/turf/unsimulated/mask = 1) flora_spawn_chance = 4 - flora_spawn_list = list(/obj/structure/flora/rock/beach = 1, /obj/structure/flora/rock/asteroid = 6) + flora_spawn_list = list( + /obj/structure/flora/tree/palm = 1, + /obj/structure/flora/rock/basalt = 1, + /obj/structure/rock/pile = 6 + ) mob_spawn_chance = 1 mob_spawn_list = list( /mob/living/simple_animal/hostile/bear/cave = 5, @@ -171,12 +171,17 @@ ) /datum/biome/cave/beach/cove - open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1) - flora_spawn_list = list(/obj/structure/flora/tree/dead_pine = 1, /obj/structure/flora/rock/beach = 1, /obj/structure/flora/driftwood = 3, /obj/structure/flora/driftlog = 2) + open_turf_types = list(/turf/simulated/floor/asteroid/beach = 1) + flora_spawn_list = list( + /obj/structure/flora/tree/pine/dead = 1, + /obj/structure/flora/rock/basalt = 1, + /obj/structure/flora/driftwood = 3, + /obj/structure/flora/driftlog = 2 + ) flora_spawn_chance = 6 /datum/biome/cave/beach/magical - open_turf_types = list(/turf/open/floor/grass/fairy/beach = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/beach/grass/fairy = 1) flora_spawn_chance = 20 flora_spawn_list = list( /obj/structure/flora/ausbushes/grassybush = 1, diff --git a/code/modules/mapgen/planetary/JungleGenerator.dm b/code/modules/mapgen/planetary/JungleGenerator.dm index 45ae4a7120c..0ad521d4628 100644 --- a/code/modules/mapgen/planetary/JungleGenerator.dm +++ b/code/modules/mapgen/planetary/JungleGenerator.dm @@ -81,19 +81,19 @@ ) /datum/biome/jungle - open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle = 1) flora_spawn_list = list( - /obj/structure/flora/grass/jungle = 1, - /obj/structure/flora/grass/jungle/b = 1, - /obj/structure/flora/tree/jungle = 3, - /obj/structure/flora/rock/jungle = 1, - /obj/structure/flora/junglebush = 1, - /obj/structure/flora/junglebush/b = 1, - /obj/structure/flora/junglebush/c = 1, - /obj/structure/flora/junglebush/large = 1, - /obj/structure/spacevine/dense = 5, - /obj/structure/spacevine/dense = 2, - /obj/structure/flora/ash/garden = 1, + /obj/structure/flora/ausbushes/jungleflora = 1, + /obj/structure/flora/ausbushes/jungleflora/grassb = 1, + /obj/structure/flora/tree/green/random = 3, + /obj/structure/flora/jungleflora/rock = 1, + /obj/structure/flora/ausbushes/jungleflora/busha = 1, + /obj/structure/flora/ausbushes/jungleflora/bushb = 1, + /obj/structure/flora/ausbushes/jungleflora/bushc = 1, + /obj/structure/flora/ausbushes/jungleflora/large = 1, + /obj/structure/flora/junglevines/heavy = 1, + /obj/structure/flora/junglevines/medium = 4, + /obj/structure/flora/junglevines/light = 3, ) flora_spawn_chance = 90 mob_spawn_chance = 0.3 @@ -105,18 +105,19 @@ /datum/biome/jungle/dense flora_spawn_chance = 100 - open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 1, /turf/open/floor/plating/dirt/jungle/dark/lit = 9) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle = 1, /turf/simulated/floor/asteroid/jungle/dirt = 9) flora_spawn_list = list( - /obj/structure/flora/grass/jungle = 1, - /obj/structure/flora/grass/jungle/b = 1, - /obj/structure/flora/tree/jungle = 5, - /obj/structure/flora/rock/jungle = 1, - /obj/structure/flora/junglebush = 1, - /obj/structure/flora/junglebush/b = 1, - /obj/structure/flora/junglebush/c = 1, - /obj/structure/flora/junglebush/large = 1, - /obj/structure/spacevine/dense = 20, - /obj/structure/flora/ash/garden = 1, + /obj/structure/flora/ausbushes/jungleflora/grassa = 1, + /obj/structure/flora/ausbushes/jungleflora/grassb = 1, + /obj/structure/flora/tree/green/random = 5, + /obj/structure/flora/jungleflora/rock = 1, + /obj/structure/flora/ausbushes/jungleflora/busha = 1, + /obj/structure/flora/ausbushes/jungleflora/bushb = 1, + /obj/structure/flora/ausbushes/jungleflora/bushc = 1, + /obj/structure/flora/ausbushes/jungleflora/large = 1, + /obj/structure/flora/junglevines/heavy = 5, + /obj/structure/flora/junglevines/medium = 8, + /obj/structure/flora/junglevines/light = 7, ) mob_spawn_chance = 0.6 mob_spawn_list = list( @@ -127,7 +128,7 @@ ) /datum/biome/jungle/plains - open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle/ = 1) flora_spawn_chance = 50 mob_spawn_chance = 1 mob_spawn_list = list( @@ -136,40 +137,36 @@ ) /datum/biome/mudlands - open_turf_types = list(/turf/open/floor/plating/dirt/jungle/dark/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle/dirt = 1) flora_spawn_list = list( - /obj/structure/flora/grass/jungle = 1, - /obj/structure/flora/grass/jungle/b = 1, - /obj/structure/flora/rock/jungle = 1, - /obj/structure/spacevine = 5, + /obj/structure/flora/ausbushes/jungleflora/grassa = 1, + /obj/structure/flora/ausbushes/jungleflora/grassb = 1, + /obj/structure/flora/jungleflora/rock = 1, + /obj/structure/flora/junglevines/medium = 1, + /obj/structure/flora/junglevines/light = 4, ) flora_spawn_chance = 20 mob_spawn_chance = 0.05 mob_spawn_list = list(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula = 1) /datum/biome/jungle_wasteland - open_turf_types = list(/turf/open/floor/plating/dirt/jungle/wasteland/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle/wasteland = 1) /datum/biome/jungle/water - open_turf_types = list(/turf/open/water/jungle/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle/water = 1) mob_spawn_chance = 1 mob_spawn_list = list(/mob/living/simple_animal/hostile/carp = 1) flora_spawn_chance = 1 - flora_spawn_list = list(/obj/structure/flora/rock = 1) + flora_spawn_list = list(/obj/structure/rock/basalt = 1) /datum/biome/cave/jungle - open_turf_types = list(/turf/open/floor/plating/dirt/jungle = 10, /turf/open/floor/plating/dirt/jungle/dark = 10) - closed_turf_types = list(/turf/closed/mineral/random/jungle = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle = 10, /turf/simulated/floor/asteroid/jungle/dirt = 10) + closed_turf_types = list(/turf/unsimulated/mask = 1) flora_spawn_chance = 5 flora_spawn_list = list( - /obj/structure/flora/rock/jungle = 1, - /obj/structure/flora/rock/pile = 1, - /obj/structure/flora/rock = 1, - /obj/structure/flora/ash/space = 1, - /obj/structure/flora/ash/leaf_shroom = 1, - /obj/structure/flora/ash/cap_shroom = 1, - /obj/structure/flora/ash/stem_shroom = 1, - /obj/structure/flora/ash/puce = 1, + /obj/structure/flora/jungleflora/rock = 1, + /obj/structure/rock/basalt/pile = 1, + /obj/structure/rock/basalt = 1, ) mob_spawn_chance = 1 mob_spawn_list = list( @@ -179,52 +176,47 @@ ) feature_spawn_chance = 0.5 feature_spawn_list = list( - /obj/item/pickaxe/rusted = 1, - /obj/structure/spawner/ice_moon = 1, - /obj/effect/spawner/lootdrop/anomaly/jungle = 1 + /obj/item/pickaxe/rusty = 1, ) /datum/biome/cave/jungle/dirt - open_turf_types = list(/turf/open/floor/plating/dirt/jungle/wasteland = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle/wasteland = 1) flora_spawn_list = list( - /obj/structure/flora/junglebush = 1, - /obj/structure/flora/junglebush/b = 1, - /obj/structure/flora/junglebush/c = 1, - /obj/structure/flora/junglebush/large = 1, - /obj/structure/flora/rock/pile/largejungle = 1, - /obj/structure/flora/grass/jungle = 1, - /obj/structure/flora/grass/jungle/b = 1, - /obj/structure/flora/ash/garden = 1, + /obj/structure/flora/ausbushes/jungleflora/busha = 1, + /obj/structure/flora/ausbushes/jungleflora/bushb = 1, + /obj/structure/flora/ausbushes/jungleflora/bushc = 1, + /obj/structure/flora/ausbushes/jungleflora/bush/large = 1, + /obj/structure/flora/jungleflora/rock/large = 1, + /obj/structure/flora/ausbushes/jungleflora/grassa = 1, + /obj/structure/flora/ausbushes/jungleflora/grassb = 1, ) /datum/biome/cave/lush - open_turf_types = list(/turf/open/floor/plating/grass/jungle = 1) - closed_turf_types = list(/turf/closed/mineral/random/jungle = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle = 1) + closed_turf_types = list(/turf/unsimulated/mask = 1) flora_spawn_chance = 50 flora_spawn_list = list( - /obj/structure/flora/tree/jungle/small = 1, - /obj/structure/flora/ausbushes/brflowers = 1, - /obj/structure/flora/ausbushes/fernybush = 1, - /obj/structure/flora/ausbushes/fullgrass = 1, - /obj/structure/flora/ausbushes/genericbush = 1, - /obj/structure/flora/ausbushes/grassybush = 1, - /obj/structure/flora/ausbushes/lavendergrass = 1, - /obj/structure/flora/ausbushes/lavendergrass = 1, + /obj/structure/flora/ausbushes/glowshroom = 1, + /obj/structure/flora/ausbushes/reedbush = 1, /obj/structure/flora/ausbushes/leafybush = 1, /obj/structure/flora/ausbushes/palebush = 1, - /obj/structure/flora/ausbushes/pointybush = 1, - /obj/structure/flora/ausbushes/ppflowers = 1, - /obj/structure/flora/ausbushes/reedbush = 1, - /obj/structure/flora/ausbushes/sparsegrass = 1, - /obj/structure/flora/ausbushes/stalkybush = 1, /obj/structure/flora/ausbushes/stalkybush = 1, + /obj/structure/flora/ausbushes/grassybush = 1, + /obj/structure/flora/ausbushes/fernybush = 1, /obj/structure/flora/ausbushes/sunnybush = 1, + /obj/structure/flora/ausbushes/genericbush = 1, + /obj/structure/flora/ausbushes/pointybush = 1, + /obj/structure/flora/ausbushes/lavendergrass = 1, /obj/structure/flora/ausbushes/ywflowers = 1, - /obj/structure/spacevine/dense = 20, - /obj/structure/spacevine/dense = 20, - /obj/structure/flora/rock/jungle = 1, - /obj/structure/flora/ash/garden = 1, - /obj/structure/flora/ash/space/voidmelon = 1 + /obj/structure/flora/ausbushes/brflowers = 1, + /obj/structure/flora/ausbushes/ppflowers = 1, + /obj/structure/flora/ausbushes/sparsegrass = 1, + /obj/structure/flora/ausbushes/fullgrass = 1, + /obj/structure/flora/ausbushes/jungleflora = 1, + /obj/structure/flora/junglevines/heavy = 10, + /obj/structure/flora/junglevines/medium = 20, + /obj/structure/flora/junglevines/light = 10, + /obj/structure/flora/jungleflora/rock = 1, ) mob_spawn_chance = 1 mob_spawn_list = list( @@ -234,11 +226,11 @@ ) /datum/biome/cave/lush/bright - open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 12, /turf/open/water/jungle/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/jungle = 12, /turf/simulated/floor/asteroid/jungle/water = 1) flora_spawn_chance = 40 mob_spawn_chance = 1 mob_spawn_list = list( - /mob/living/simple_animal/hostile/lightgeist = 1 + mob/living/simple_animal/hostile/lightgeist = 1 ) feature_spawn_chance = 0.1 - feature_spawn_list = list(/obj/item/rod_of_asclepius = 1) + feature_spawn_list = list(/obj/item/staff/plague_bell = 1) diff --git a/code/modules/mapgen/planetary/LavaGenerator.dm b/code/modules/mapgen/planetary/LavaGenerator.dm index 3cb717f665a..6b38a2f8f99 100644 --- a/code/modules/mapgen/planetary/LavaGenerator.dm +++ b/code/modules/mapgen/planetary/LavaGenerator.dm @@ -84,31 +84,20 @@ /datum/biome/lavaland open_turf_types = list( - /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit = 1, + /turf/simulated/floor/asteroid/basalt/lavaplanet = 1, ) flora_spawn_chance = 1 flora_spawn_list = list( - /obj/structure/flora/ausbushes/ywflowers/hell = 10, - /obj/structure/flora/ausbushes/sparsegrass/hell = 40, - /obj/structure/flora/ash/fern = 5, - /obj/structure/flora/ash/fireblossom = 1, - /obj/structure/flora/ash/puce = 5, - /obj/item/mine/pressure/explosive/rusty/live = 1, + /obj/structure/flora/ausbushes/hell/ywflowers = 10, + /obj/structure/flora/ausbushes/hell/sparsegrass = 40, + /obj/structure/landmine = 1, ) feature_spawn_chance = 0.3 feature_spawn_list = list( - /obj/structure/flora/rock/hell = 20, - /obj/structure/elite_tumor = 4, - /obj/structure/geyser/random = 4, - /obj/effect/spawner/lootdrop/anomaly/lava = 2, - /obj/structure/flora/rock/hell = 14, - /obj/structure/vein = 5, - /obj/structure/vein/classtwo = 2, - /obj/structure/elite_tumor = 2, - /obj/structure/geyser/random = 2, - /obj/structure/vein/classthree = 1, - /obj/effect/spawner/minefield = 1, - /obj/effect/spawner/lootdrop/anomaly/lava = 1, + /obj/structure/rock/basalt = 20, + /obj/structure/geyser/random = 6, + /obj/structure/rock/basalt = 14, + /obj/effect/minefield = 1, ) mob_spawn_chance = 4 mob_spawn_list = list( @@ -116,72 +105,67 @@ ) /datum/biome/lavaland/forest - open_turf_types = list(/turf/open/floor/plating/asteroid/purple/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/basalt/purple/sand = 1) flora_spawn_list = list( /obj/structure/flora/tree/dead/tall/grey = 1, /obj/structure/flora/tree/dead/barren = 1, - /obj/structure/flora/ausbushes/fullgrass/hell = 10, - /obj/structure/flora/ausbushes/sparsegrass/hell = 5 + /obj/structure/flora/ausbushes/hell/fullgrass = 10, + /obj/structure/flora/ausbushes/hell/sparsegrass = 5 ) flora_spawn_chance = 85 /datum/biome/lavaland/forest/rocky flora_spawn_list = list( - /obj/structure/flora/rock/pile/lava = 3, - /obj/structure/flora/rock/lava = 2, + /obj/structure/rock/lava/pile = 3, + /obj/structure/rock/lava = 2, /obj/structure/flora/tree/dead/tall/grey = 10, - /obj/structure/flora/ausbushes/fullgrass/hell = 40, - /obj/structure/flora/ausbushes/sparsegrass/hell = 20, + /obj/structure/flora/ausbushes/hell/fullgrass = 40, + /obj/structure/flora/ausbushes/hell/sparsegrass = 20, /obj/structure/flora/ausbushes/hell = 2 ) flora_spawn_chance = 65 /datum/biome/lavaland/plains open_turf_types = list( - /turf/open/floor/plating/grass/lava/purple = 30 + /turf/simulated/floor/asteroid/lavaplanet/grass/purple = 30 ) flora_spawn_list = list( - /obj/structure/flora/ausbushes/fullgrass/hell = 50, - /obj/structure/flora/ausbushes/sparsegrass/hell = 35, - /obj/structure/flora/ausbushes/ywflowers/hell = 1, - /obj/structure/flora/ausbushes/grassybush/hell = 4, - /obj/structure/flora/firebush = 1 + /obj/structure/flora/ausbushes/hell/fullgrass = 50, + /obj/structure/flora/ausbushes/hell/sparsegrass = 35, + /obj/structure/flora/ausbushes/hell/ywflowers = 1, + /obj/structure/flora/ausbushes/hell/grassybush = 4, + /obj/structure/flora/ausbushes/hell/firebush = 1 ) flora_spawn_chance = 15 /datum/biome/lavaland/plains/dense flora_spawn_chance = 85 open_turf_types = list( - /turf/open/floor/plating/grass/lava = 50 + /turf/simulated/floor/asteroid/lavaplanet/grass = 50 ) feature_spawn_chance = 5 feature_spawn_list = list( /obj/structure/flora/tree/dead/barren = 50, /obj/structure/flora/tree/dead/tall/grey = 45, - /obj/effect/spawner/lootdrop/anomaly/lava = 10, - /obj/structure/vein = 5, - /obj/structure/vein/classtwo = 2, - /obj/structure/vein/classthree = 1, ) /datum/biome/lavaland/plains/dense/mixed flora_spawn_chance = 50 open_turf_types = list( - /turf/open/floor/plating/grass/lava = 50, - /turf/open/floor/plating/grass/lava/purple = 45, - /turf/open/floor/plating/moss = 1 + /turf/simulated/floor/asteroid/lavaplanet/grass = 50, + /turf/simulated/floor/asteroid/lavaplanet/grass/purple = 45, ) /datum/biome/lavaland/outback open_turf_types = list( - /turf/open/floor/plating/grass/lava/orange = 20 + /turf/simulated/floor/asteroid/lavaplanet/grass/orange = 20 ) flora_spawn_list = list( - /obj/structure/flora/ausbushes/grassybush/hell = 10, - /obj/structure/flora/ausbushes/genericbush/hell = 10, - /obj/structure/flora/ausbushes/sparsegrass/hell = 3, + /obj/structure/flora/ausbushes/hell/grassybush = 10, + /obj/structure/flora/ausbushes/hell/genericbush = 10, + /obj/structure/flora/ausbushes/hell/sparsegrass = 3, /obj/structure/flora/ausbushes/hell = 3, /obj/structure/flora/tree/dead/hell = 3, /obj/structure/flora/rock/lava = 2 @@ -190,28 +174,27 @@ /datum/biome/lavaland/lush open_turf_types = list( - /turf/open/floor/plating/grass/lava/purple = 20, - /turf/open/floor/plating/asteroid/basalt/purple/lit = 1 + /turf/simulated/floor/asteroid/lavaplanet/grass/purple = 20, + /turf/simulated/floor/asteroid/basalt/purple = 1 ) flora_spawn_list = list( - /obj/structure/flora/ash/fireblossom = 3, /obj/structure/flora/tree/dead/hell = 1, - /obj/structure/flora/ausbushes/grassybush/hell = 5, - /obj/structure/flora/ausbushes/fullgrass/hell = 10, - /obj/structure/flora/ausbushes/sparsegrass/hell = 8, + /obj/structure/flora/ausbushes/hell/grassybush = 5, + /obj/structure/flora/ausbushes/hell/fullgrass = 10, + /obj/structure/flora/ausbushes/hell/sparsegrass = 8, /obj/structure/flora/ausbushes/hell = 5, - /obj/structure/flora/ausbushes/fernybush/hell = 5, - /obj/structure/flora/ausbushes/genericbush/hell = 5, - /obj/structure/flora/ausbushes/ywflowers/hell = 7, - /obj/structure/flora/firebush = 3 + /obj/structure/flora/ausbushes/hell/fernybus= 5, + /obj/structure/flora/ausbushes/hell/genericbush = 5, + /obj/structure/flora/ausbushes/hell/ywflowers = 7, + /obj/structure/flora/ausbushes/hell/firebush = 3 ) flora_spawn_chance = 30 /datum/biome/lavaland/lava - open_turf_types = list(/turf/open/lava/smooth/lava_land_surface = 1) + open_turf_types = list(/turf/simulated/floor/natural/lava = 1) flora_spawn_list = list( - /obj/structure/flora/rock/lava = 1, - /obj/structure/flora/rock/pile/lava = 1 + /obj/structure/rock/lava = 1, + /obj/structure/rock/lava/pile = 1 ) flora_spawn_chance = 2 feature_spawn_chance = 0 @@ -221,10 +204,10 @@ /datum/biome/cave/lavaland open_turf_types = list( - /turf/open/floor/plating/asteroid/basalt/lava_land_surface = 1 + /turf/simulated/floor/asteroid/basalt/lavaplanet = 1 ) closed_turf_types = list( - /turf/closed/mineral/random/volcanic = 1 + /turf/unsimulated/mask = 1 ) mob_spawn_chance = 4 mob_spawn_list = list( @@ -232,41 +215,20 @@ ) flora_spawn_chance = 1 flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 1, - /obj/structure/flora/ash/cap_shroom = 2, - /obj/structure/flora/ash/stem_shroom = 2, - /obj/structure/flora/ash/cacti = 1, - /obj/structure/flora/ash/tall_shroom = 2, - /obj/structure/flora/ash/fern = 2, - /obj/structure/flora/ash/puce = 2, - /obj/item/mine/proximity/explosive/live = 1, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/landmine = 1, + /obj/structure/landmine = 1 ) /datum/biome/cave/lavaland/rocky - open_turf_types = list(/turf/open/floor/plating/asteroid/purple = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/basalt/purple/sand = 1) flora_spawn_list = list( - /obj/structure/flora/rock/pile/lava = 3, - /obj/structure/flora/rock/lava = 3, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/rock/lava/pile = 3, + /obj/structure/rock/lava = 3, + /obj/structure/landmine = 1 ) flora_spawn_chance = 5 -/datum/biome/cave/lavaland/mossy - open_turf_types = list(/turf/open/floor/plating/moss = 1) - flora_spawn_chance = 80 - flora_spawn_list = list( - /obj/structure/flora/ausbushes/fullgrass/hell = 10, - /obj/structure/flora/ausbushes/sparsegrass/hell = 5, - /obj/structure/flora/ash/leaf_shroom = 1, - /obj/structure/flora/ash/cap_shroom = 2, - /obj/structure/flora/ash/stem_shroom = 2, - /obj/structure/flora/ash/cacti = 1, - /obj/item/mine/pressure/explosive/rusty/live = 1, - /obj/structure/flora/ash/tall_shroom = 2 - ) - /datum/biome/cave/lavaland/lava - open_turf_types = list(/turf/open/lava/smooth/lava_land_surface = 1) + open_turf_types = list(/turf/simulated/floor/natural/lava = 1) feature_spawn_chance = 1 - feature_spawn_list = list(/obj/structure/flora/rock/pile/lava = 1) + feature_spawn_list = list(/obj/structure/rock/lava/pile = 1) diff --git a/code/modules/mapgen/planetary/RockGenerator.dm b/code/modules/mapgen/planetary/RockGenerator.dm index ab9732bac3c..8c89c993758 100644 --- a/code/modules/mapgen/planetary/RockGenerator.dm +++ b/code/modules/mapgen/planetary/RockGenerator.dm @@ -81,29 +81,21 @@ ) /datum/biome/rock - open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/rockplanet = 1) feature_spawn_chance = 0.25 feature_spawn_list = list( - /obj/structure/geyser/random = 80, - /obj/structure/vein = 60, - /obj/structure/elite_tumor = 40, - /obj/structure/vein/classtwo = 40, - /obj/effect/spawner/lootdrop/anomaly/rock = 10, - /obj/structure/vein/classthree = 10, - /obj/effect/spawner/minefield = 2, - /obj/effect/spawner/lootdrop/anomaly/big = 1 //get out of here stalker + obj/structure/geyser/random = 80, + /obj/effect/minefield = 2, ) flora_spawn_chance = 5 mob_spawn_chance = 3 flora_spawn_list = list( - /obj/structure/flora/rock/rockplanet = 6, + /obj/structure/rock/rockplanet = 6, /obj/structure/flora/tree/cactus = 8, - /obj/structure/flora/ash/cacti = 2, - /obj/structure/flora/ash/garden/arid = 2, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/landmine = 1 ) mob_spawn_list = list( @@ -112,49 +104,37 @@ /datum/biome/rock/icecap open_turf_types = list( - /turf/open/floor/plating/asteroid/snow/lit/rockplanet = 1, - /turf/open/floor/plating/asteroid/snow/lit/rockplanet = 5) + /turf/simulated/floor/natural/frozenground/snow = 6) flora_spawn_chance = 1 mob_spawn_chance = 2 /datum/biome/rock/wetlands - open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/wet/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/rockplanet/wet = 1) flora_spawn_chance = 5 mob_spawn_chance = 4 mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/goliath = 30, ) flora_spawn_list = list( - /obj/structure/flora/rock/rockplanet = 6, + /obj/structure/rock/rockplanet = 6, /obj/structure/flora/tree/cactus = 8, - /obj/structure/flora/ash/cacti = 2, /obj/structure/flora/grass/rockplanet/dead = 8, - /obj/structure/flora/ash/garden/arid = 1, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/landmine = 1 ) /datum/biome/cave/rock - closed_turf_types = list(/turf/closed/mineral/random/rockplanet = 1) - open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/cracked = 1) + closed_turf_types = list(/turf/unsimulated/mask = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/rockplanet/cracked = 1) flora_spawn_chance = 4 flora_spawn_list = list( - /obj/structure/flora/rock/rockplanet = 8, - /obj/structure/flora/rock/pile/rockplanet = 8, - /obj/structure/flora/ash/fern = 4, - /obj/structure/flora/ash/puce = 2, - /obj/item/mine/pressure/explosive/rusty/live = 1, - /obj/item/mine/proximity/explosive/live = 1, + /obj/structure/rock/rockplanet = 8, + /obj/structure/rock/rockplanet/pile = 8, + /obj/structure/landmine = 2, ) feature_spawn_chance = 0.5 feature_spawn_list = list( - /obj/structure/vein = 3, /obj/structure/geyser/random = 2, - /obj/structure/vein/classtwo = 2, - /obj/structure/elite_tumor = 1, - /obj/structure/vein/classthree = 1, /obj/effect/spawner/minefield = 1, - /obj/structure/spawner/ice_moon/rockplanet = 4, - /obj/effect/spawner/lootdrop/anomaly/rock/cave = 1, ) mob_spawn_chance = 6 mob_spawn_list = list( @@ -162,16 +142,12 @@ ) /datum/biome/cave/rock/wet - open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/cracked = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/rockplanet/cracked = 1) flora_spawn_chance = 5 flora_spawn_list = list( - /obj/structure/flora/rock/rockplanet = 8, - /obj/structure/flora/rock/pile/rockplanet = 8, - /obj/structure/flora/ash/fern = 6, - /obj/structure/flora/ash/puce = 4, - /obj/structure/flora/ash/garden/arid = 2, - /obj/item/mine/proximity/explosive/live = 1, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/rock/rockplanet = 8, + /obj/structure/rock/rockplanet/pile = 8, + /obj/structure/landmine = 2 ) mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/goliath = 30, diff --git a/code/modules/mapgen/planetary/SandGenerator.dm b/code/modules/mapgen/planetary/SandGenerator.dm index 1cee8a7de9f..ed9b9144689 100644 --- a/code/modules/mapgen/planetary/SandGenerator.dm +++ b/code/modules/mapgen/planetary/SandGenerator.dm @@ -82,21 +82,11 @@ ) /datum/biome/sand - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands = 1) flora_spawn_chance = 3 - flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 4 , - /obj/structure/flora/ash/cap_shroom = 4 , - /obj/structure/flora/ash/stem_shroom = 4 , - ) feature_spawn_chance = 0.1 feature_spawn_list = list( /obj/structure/geyser/random = 8, - /obj/structure/vein = 8, - /obj/structure/vein/classtwo = 4, - /obj/structure/elite_tumor = 4, - /obj/structure/vein/classthree = 2, - /obj/effect/spawner/lootdrop/anomaly/sand = 1, ) mob_spawn_chance = 4 mob_spawn_list = list( @@ -108,27 +98,20 @@ /datum/biome/sand/wasteland open_turf_types = list( - /turf/open/floor/plating/asteroid/whitesands/lit = 50, - /turf/open/floor/plating/asteroid/whitesands/dried/lit = 40, - /turf/closed/mineral/random/whitesands = 20, - /turf/closed/wall/mineral/titanium/survival/pod = 1, - /turf/closed/wall/rust = 1 + /turf/simulated/floor/asteroid/whitesands = 50, + /turf/simulated/floor/asteroid/whitesands/dried = 40, + /turf/unsimulated/mask = 20, ) flora_spawn_chance = 20 flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 4, - /obj/structure/flora/ash/cap_shroom = 4, - /obj/structure/flora/ash/stem_shroom = 4, /obj/effect/decal/remains/human = 4, /obj/effect/spawner/lootdrop/maintenance = 40, ) /datum/biome/sand/grass - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/grass/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/grass = 1) flora_spawn_chance = 5 flora_spawn_list = list( - /obj/structure/flora/ash/cacti = 2, - /obj/structure/flora/ash/fern = 4, /obj/structure/flora/tree/tall/whitesands = 4, /obj/structure/flora/rock = 3, /obj/structure/flora/rock/pile = 3, @@ -139,31 +122,24 @@ ) /datum/biome/sand/grass/dead - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/grass/dead/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/grass/dead = 1) flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 2, - /obj/structure/flora/ash/cap_shroom = 2, - /obj/structure/flora/ash/stem_shroom = 2, - /obj/structure/flora/ash/fern = 4, /obj/structure/flora/tree/dead/barren = 4, - /obj/structure/flora/rock = 3, - /obj/structure/flora/rock/pile = 3, + /obj/structure/rock/basalt = 3, + /obj/structure/rock/basalt/pile = 3, ) /datum/biome/sand/icecap - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 1, /turf/open/floor/plating/asteroid/snow/lit/whitesands = 5) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands = 1, /turf/simulated/floor/natural/frozenground/snow = 5) flora_spawn_chance = 4 mob_spawn_chance = 1 flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 2 , - /obj/structure/flora/ash/cap_shroom = 2 , - /obj/structure/flora/ash/stem_shroom = 2 , - /obj/structure/flora/rock = 3, - /obj/structure/flora/rock/pile = 3, + /obj/structure/rock/basalt = 3, + /obj/structure/rock/basalt/pile = 3, ) /datum/biome/sand/riverbed - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried/lit = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/dried = 1) flora_spawn_chance = 0 mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 40, @@ -172,34 +148,19 @@ /mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 40, ) -/datum/biome/sand/acid //plains - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 10, /turf/open/acid/whitesands = 1) - -/datum/biome/sand/acid/total - open_turf_types = list(/turf/open/acid/whitesands = 1) - flora_spawn_chance = 0 - feature_spawn_chance = 0 - mob_spawn_chance = 0 - /datum/biome/cave/sand - closed_turf_types = list(/turf/closed/mineral/random/whitesands = 1) + closed_turf_types = list(/turf/unsimulated/mask = 1) open_turf_types = list( - /turf/open/floor/plating/asteroid/whitesands = 5, - /turf/open/floor/plating/asteroid/whitesands/dried = 1 + /turf/simulated/floor/asteroid/whitesands = 5, + /turf/simulated/floor/asteroid/whitesands/dried = 1 ) flora_spawn_chance = 4 flora_spawn_list = list( - /obj/structure/flora/rock = 4, - /obj/structure/flora/rock/pile = 4, - /obj/structure/flora/ash/fern = 2, - /obj/structure/flora/ash/puce = 1, + /obj/structure/rock/basalt = 4, + /obj/structure/rock/basalt/pile = 4, ) feature_spawn_list = list( - /obj/structure/vein = 8, /obj/structure/geyser/random = 4, - /obj/structure/vein/classtwo = 4, - /obj/structure/elite_tumor = 4, - /obj/effect/spawner/lootdrop/anomaly/sand/cave = 1 ) mob_spawn_chance = 4 mob_spawn_list = list( @@ -207,18 +168,15 @@ ) /datum/biome/cave/sand/deep - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/dried = 1) mob_spawn_chance = 4 mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/goliath = 50, ) /datum/biome/cave/sand/volcanic - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/dried = 1) mob_spawn_chance = 2 /datum/biome/cave/sand/volcanic/lava - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 7, /turf/open/lava = 1) - -/datum/biome/cave/sand/volcanic/acidic - open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 8, /turf/open/acid/whitesands = 1) + open_turf_types = list(/turf/simulated/floor/asteroid/whitesands/dried = 7, /turf/simulated/floor/natural/lava = 1) diff --git a/code/modules/mapgen/planetary/SnowGenerator.dm b/code/modules/mapgen/planetary/SnowGenerator.dm index bc120c26d76..65499418de1 100644 --- a/code/modules/mapgen/planetary/SnowGenerator.dm +++ b/code/modules/mapgen/planetary/SnowGenerator.dm @@ -87,13 +87,13 @@ /datum/biome/snow open_turf_types = list( - /turf/open/floor/plating/asteroid/snow/lit = 25 + /turf/simulated/floor/asteroid/snow = 25 ) flora_spawn_list = list( /obj/structure/flora/tree/pine = 4, - /obj/structure/flora/rock/icy = 4, - /obj/structure/flora/rock/pile/icy = 4, - /obj/structure/flora/grass/both = 12, + /obj/structure/rock/icy = 4, + /obj/structure/rock/icy/pile = 4, + /obj/structure/flora/grass/snowy/both = 12, ) flora_spawn_chance = 10 mob_spawn_chance = 1 @@ -114,16 +114,16 @@ /datum/biome/snow/lush open_turf_types = list( - /turf/open/floor/plating/asteroid/snow/lit = 25 + /turf/simulated/floor/asteroid/snow = 25 ) flora_spawn_list = list( - /obj/structure/flora/grass/both = 1, + /obj/structure/flora/grass/snowy/both = 1, ) flora_spawn_chance = 30 /datum/biome/snow/thawed open_turf_types = list( - /turf/open/floor/plating/asteroid/icerock/lit = 1 + /turf/simulated/floor/asteroid/snow/icerock = 1 ) flora_spawn_chance = 40 flora_spawn_list = list( @@ -132,7 +132,6 @@ /obj/structure/flora/ausbushes = 1, /obj/structure/flora/ausbushes/ppflowers = 1, /obj/structure/flora/ausbushes/lavendergrass = 1, - /obj/structure/flora/ash/garden/frigid = 1, ) /datum/biome/snow/forest @@ -140,8 +139,8 @@ flora_spawn_list = list( /obj/structure/flora/tree/pine = 20, /obj/structure/flora/tree/dead = 6, - /obj/structure/flora/grass/both = 8, - /obj/item/mine/pressure/explosive/rusty/live = 1, + /obj/structure/flora/grass/snowy/both = 8, + /obj/structure/landmine = 1, ) /datum/biome/snow/forest/dense @@ -150,22 +149,17 @@ /obj/structure/flora/tree/pine = 20, /obj/structure/flora/grass/both = 6, /obj/structure/flora/tree/dead = 3, - /obj/item/mine/pressure/explosive/rusty/live = 1, + /obj/structure/landmine = 1, ) /datum/biome/arctic open_turf_types = list( - /turf/open/floor/plating/asteroid/snow/lit = 1 + /turf/simulated/floor/asteroid/snow = 1 ) feature_spawn_chance = 0.1 feature_spawn_list = list( - /obj/structure/spawner/ice_moon = 2, - /obj/structure/spawner/ice_moon/polarbear = 2, /obj/structure/statue/snow/snowman = 3, /obj/structure/statue/snow/snowlegion = 1, - /obj/structure/vein/ice = 3, - /obj/structure/vein/ice/classtwo = 4, - /obj/structure/vein/ice/classthree = 1, ) mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/wolf/random = 30, @@ -183,15 +177,15 @@ /datum/biome/arctic/rocky flora_spawn_chance = 5 flora_spawn_list = list( - /obj/structure/flora/rock/icy = 2, - /obj/structure/flora/rock/pile/icy = 2, + /obj/structure/rock/icy = 2, + /obj/structure/rock/icy/pile = 2, ) /datum/biome/iceberg open_turf_types = list( - /turf/open/floor/plating/asteroid/iceberg/lit = 6, - /turf/open/floor/plating/ice/iceberg/lit = 1, - /turf/closed/mineral/ice = 10 + /turf/simulated/floor/asteroid/snow/iceberg = 6, + /turf/simulated/floor/natural/ice/iceberg = 1, + /turf/unsimulated/mask = 10 ) mob_spawn_chance = 2 mob_spawn_list = list( @@ -204,50 +198,30 @@ /mob/living/simple_animal/hostile/asteroid/lobstrosity = 5, ) feature_spawn_chance = 0.3 - feature_spawn_list = list( - /obj/effect/spawner/lootdrop/anomaly/ice = 100, - /obj/effect/spawner/lootdrop/anomaly/big = 1, - /obj/structure/spawner/ice_moon/demonic_portal/low_threat = 200, - /obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 400, - /obj/structure/spawner/ice_moon/demonic_portal/high_threat = 40, - /obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1, - /obj/structure/vein/ice = 300, - /obj/structure/vein/ice/classtwo = 500, - /obj/structure/vein/ice/classthree = 50, - ) - /datum/biome/iceberg/lake open_turf_types = list( - /turf/open/floor/plating/ice/lit = 1 + /turf/simulated/floor/natural/ice/fancy = 1 ) /datum/biome/plasma open_turf_types = list( - /turf/open/lava/plasma/ice_moon = 5, - /turf/open/floor/plating/asteroid/icerock/smooth = 1 + /turf/simulated/floor/asteroid/snow/icerock/smooth = 1 ) /datum/biome/cave/snow open_turf_types = list( - /turf/open/floor/plating/asteroid/icerock = 1 + /turf/simulated/floor/asteroid/snow/icerock = 1 ) flora_spawn_chance = 6 flora_spawn_list = list( - /obj/structure/flora/grass/both = 10, - /obj/structure/flora/rock/pile/icy = 2, + /obj/structure/flora/grass/snowy/both = 10, /obj/structure/flora/rock/icy = 2, - /obj/structure/flora/ash/space = 2, - /obj/structure/flora/ash/leaf_shroom = 2, - /obj/structure/flora/ash/cap_shroom = 2, - /obj/structure/flora/ash/stem_shroom = 2, - /obj/structure/flora/ash/puce = 2, - /obj/structure/flora/ash/garden/frigid = 2, - /obj/item/mine/proximity/explosive/live = 1, - /obj/item/mine/pressure/explosive/rusty/live = 1 + /obj/structure/flora/rock/icy/pile = 2, + /obj/structure/landmine = 2 ) closed_turf_types = list( - /turf/closed/mineral/random/snow = 1 + /turf/unsimulated/mask = 1 ) mob_spawn_chance = 2 mob_spawn_list = list( @@ -263,42 +237,32 @@ ) feature_spawn_chance = 0.2 feature_spawn_list = list( - /obj/structure/spawner/ice_moon/demonic_portal/low_threat = 20, - /obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 40, - /obj/structure/spawner/ice_moon/demonic_portal/high_threat = 5, - /obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1, - /obj/structure/spawner/ice_moon = 20, - /obj/structure/spawner/ice_moon/polarbear = 20, - /obj/effect/spawner/lootdrop/anomaly/ice/cave = 10, - /obj/structure/vein/ice = 30, - /obj/structure/vein/ice/classtwo = 50, - /obj/structure/vein/ice/classthree = 6, - /obj/effect/spawner/minefield = 2, + /obj/effect/minefield = 2, ) /datum/biome/cave/snow/thawed open_turf_types = list( - /turf/open/floor/plating/asteroid/icerock/cracked = 1 + /turf/simulated/floor/asteroid/snow/icerock/cracked = 1 ) closed_turf_types = list( - /turf/closed/mineral/random/snow = 1 + /turf/unsimulated/mask = 1 ) /datum/biome/cave/snow/ice open_turf_types = list( - /turf/open/floor/plating/asteroid/icerock = 20, - /turf/open/floor/plating/ice = 3 + /turf/simulated/floor/asteroid/snow/icerock = 20, + /turf/simulated/floor/natural/ice/fancy = 3 ) closed_turf_types = list( - /turf/closed/mineral/random/snow = 1 + /turf/unsimulated/mask = 1 ) /datum/biome/cave/volcanic open_turf_types = list( - /turf/open/floor/plating/asteroid/basalt = 1 + /turf/simulated/floor/asteroid/basalt = 1 ) closed_turf_types = list( - /turf/closed/mineral/random/snow = 1 + /turf/unsimulated/mask = 1 ) mob_spawn_chance = 2 mob_spawn_list = list( @@ -312,26 +276,23 @@ ) flora_spawn_chance = 3 flora_spawn_list = list( - /obj/structure/flora/ash/leaf_shroom = 3, - /obj/structure/flora/ash/cap_shroom = 3, - /obj/structure/flora/ash/stem_shroom = 3, - /obj/item/mine/pressure/explosive/fire/live = 1, + /obj/structure/landmine = 1, ) feature_spawn_chance = 0.2 /datum/biome/cave/volcanic/lava open_turf_types = list( - /turf/open/lava/smooth = 10, - /turf/open/floor/plating/asteroid/icerock/smooth = 1 + /turf/simulated/floor/natural/lava = 10, + /turf/simulated/floor/asteroid/snow/icerock/smooth = 1 ) /datum/biome/cave/volcanic/lava/total open_turf_types = list( - /turf/open/lava/smooth = 1 + /turf/simulated/floor/natural/lava = 1 ) /datum/biome/cave/volcanic/lava/plasma open_turf_types = list( - /turf/open/lava/plasma = 7, - /turf/open/floor/plating/asteroid/icerock/smooth = 1 + /turf/simulated/floor/natural/lava = 7, + /turf/simulated/floor/asteroid/snow/icerock/smooth = 1 ) diff --git a/code/modules/mapgen/planetary/WasteGenerator.dm b/code/modules/mapgen/planetary/WasteGenerator.dm deleted file mode 100644 index a6cd2a318d1..00000000000 --- a/code/modules/mapgen/planetary/WasteGenerator.dm +++ /dev/null @@ -1,454 +0,0 @@ -/datum/map_generator/planet_generator/waste - - mountain_height = 0.35 - perlin_zoom = 40 - - initial_closed_chance = 45 - smoothing_iterations = 20 - birth_limit = 4 - death_limit = 3 - primary_area_type = /area/overmap_encounter/planetoid/wasteplanet - - //not sure if this is the best but it's there - biome_table = list( - BIOME_COLDEST = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste/crater, - BIOME_LOW_HUMIDITY = /datum/biome/waste/crater, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste/clearing, - BIOME_HIGH_HUMIDITY = /datum/biome/waste/clearing/mushroom, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste/metal/rust - ), - BIOME_COLD = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste/crater, - BIOME_LOW_HUMIDITY = /datum/biome/waste/crater/rad, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste, - BIOME_HIGH_HUMIDITY = /datum/biome/waste/clearing/mushroom, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste/tar_bed - ), - BIOME_WARM = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste/clearing, //to-do, add chembees - BIOME_LOW_HUMIDITY = /datum/biome/waste/clearing, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste/clearing/mushroom, - BIOME_HIGH_HUMIDITY = /datum/biome/waste, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste - ), - BIOME_TEMPERATE = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste, - BIOME_LOW_HUMIDITY = /datum/biome/waste/tar_bed, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste/metal, - BIOME_HIGH_HUMIDITY = /datum/biome/waste, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste/metal/rust - ), - BIOME_HOT = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste, - BIOME_LOW_HUMIDITY = /datum/biome/waste/tar_bed, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste/tar_bed, - BIOME_HIGH_HUMIDITY = /datum/biome/waste/tar_bed/total, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste/tar_bed/total - ), - BIOME_HOTTEST = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/waste/metal, - BIOME_LOW_HUMIDITY = /datum/biome/waste/metal, - BIOME_MEDIUM_HUMIDITY = /datum/biome/waste/metal, - BIOME_HIGH_HUMIDITY = /datum/biome/waste/metal/rust, - BIOME_HIGHEST_HUMIDITY = /datum/biome/waste/metal/rust - ) - ) - - cave_biome_table = list( - BIOME_COLDEST_CAVE = list( //irradiated caves - BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste, - BIOME_LOW_HUMIDITY = /datum/biome/cave/waste, - BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste/tar_bed, - BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/tar_bed/full, - BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste/tar_bed/full - ), - BIOME_COLD_CAVE = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste, - BIOME_LOW_HUMIDITY = /datum/biome/cave/waste/rad, - BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste, - BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/rad, - BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste - ), - BIOME_WARM_CAVE = list( - BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste, - BIOME_LOW_HUMIDITY = /datum/biome/cave/waste, - BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste/metal, - BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/metal, - BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste/tar_bed - ), - BIOME_HOT_CAVE = list( //metal wreck for salvaging - BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste/metal/hivebot, - BIOME_LOW_HUMIDITY = /datum/biome/cave/waste/metal/hivebot, - BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste/metal/hivebot, - BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/metal/, - BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste/metal/ - ) - ) - -/datum/biome/waste - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet/lit = 80, - /turf/open/floor/plating/wasteplanet/rust/lit = 15, - /turf/open/floor/plating/wasteplanet/lit = 5 - ) - - flora_spawn_list = list( - - //mech spawners - /obj/effect/spawner/lootdrop/waste/mechwreck = 100, - /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20, - - //decals and fluff structures - /obj/effect/spawner/lootdrop/waste/trash = 1800, - /obj/effect/spawner/lootdrop/waste/radiation = 80, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10, - - //stuff you can actually use - /obj/effect/spawner/lootdrop/waste/girder = 600, - /obj/structure/reagent_dispensers/fueltank = 100, - /obj/structure/reagent_dispensers/watertank = 200, - /obj/item/stack/cable_coil/cut = 500, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/atmos_can = 50, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 300, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200, - /obj/effect/spawner/lootdrop/maintenance = 200, - /obj/effect/spawner/lootdrop/maintenance/two = 100, - /obj/effect/spawner/lootdrop/maintenance/three = 50, - /obj/effect/spawner/lootdrop/maintenance/four = 20, - - //plants - /obj/structure/flora/ash/garden/waste = 70, - /obj/structure/flora/ash/glowshroom = 200, //more common in caves - - - //the illusive shrapnel plant - /obj/item/mine/pressure/explosive/shrapnel/live = 30, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield = 2 - ) - - feature_spawn_list = list( - /obj/effect/radiation/waste = 30, - /obj/effect/radiation/waste/intense = 10, - /obj/structure/geyser/random = 1, - /obj/effect/spawner/lootdrop/anomaly/waste = 1 - ) - - mob_spawn_list = list( - /mob/living/simple_animal/hostile/asteroid/goliath = 70, - ) - - flora_spawn_chance = 25 - feature_spawn_chance = 0.5 - mob_spawn_chance = 2 - -/datum/biome/waste/crater - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet/lit = 90, - /turf/open/floor/plating/wasteplanet/rust/lit = 10, - ) - - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/trash = 180, - /obj/effect/spawner/lootdrop/waste/radiation = 16, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2, - /obj/effect/spawner/lootdrop/waste/atmos_can = 36, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 60, - ) - mob_spawn_chance = 1 - -/datum/biome/waste/crater/rad - flora_spawn_list = list( - /obj/structure/flora/ash/glowshroom = 180, - /obj/effect/spawner/lootdrop/waste/trash = 90, - /obj/effect/spawner/lootdrop/waste/radiation = 25, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 7, - /obj/effect/spawner/lootdrop/waste/atmos_can = 7, - /obj/effect/spawner/lootdrop/waste/salvageable = 15 - ) - -/datum/biome/waste/clearing - flora_spawn_chance = 20 - feature_spawn_chance = 2 - -/datum/biome/waste/clearing/mushroom - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/mechwreck = 100, - /obj/effect/spawner/lootdrop/waste/trash = 900, - /obj/effect/spawner/lootdrop/waste/radiation = 300, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 120, - /obj/effect/spawner/lootdrop/waste/girder = 600, - /obj/structure/reagent_dispensers/fueltank = 100, - /obj/structure/reagent_dispensers/watertank = 200, - /obj/item/stack/cable_coil/cut = 500, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/atmos_can = 50, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 300, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200, - /obj/effect/spawner/lootdrop/maintenance = 200, - /obj/effect/spawner/lootdrop/maintenance/two = 100, - /obj/effect/spawner/lootdrop/maintenance/three = 50, - /obj/effect/spawner/lootdrop/maintenance/four = 20, - /obj/structure/flora/ash/garden/waste = 300, - /obj/structure/flora/ash/glowshroom = 1800, - /obj/item/mine/pressure/explosive/shrapnel/live = 30, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield = 2 - ) - -/datum/biome/waste/tar_bed //tar colorings - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet/lit = 70, - /turf/open/floor/plating/wasteplanet/rust/lit = 10, - ) - -/datum/biome/waste/tar_bed/total - open_turf_types = list( - /turf/open/water/tar/waste/lit = 1 - ) - flora_spawn_chance = 0 - -/datum/biome/waste/metal - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet/lit = 5, - /turf/open/floor/plating/wasteplanet/rust/lit = 45, - /turf/open/floor/plating/wasteplanet/lit = 50 - ) - - flora_spawn_list = list( //there are no plants here - /obj/effect/spawner/lootdrop/waste/mechwreck = 200, - /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 50, - /obj/effect/spawner/lootdrop/waste/trash = 900, - /obj/effect/spawner/lootdrop/waste/radiation = 80, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 20, - /obj/effect/spawner/lootdrop/waste/girder = 600, - /obj/structure/reagent_dispensers/fueltank = 100, - /obj/structure/reagent_dispensers/watertank = 200, - /obj/item/stack/cable_coil/cut = 500, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/atmos_can = 50, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 300, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200, - /obj/effect/spawner/lootdrop/maintenance = 200, - /obj/effect/spawner/lootdrop/maintenance/two = 100, - /obj/effect/spawner/lootdrop/maintenance/three = 50, - /obj/effect/spawner/lootdrop/maintenance/four = 20, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/atmos_can = 180, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 300, - /obj/item/mine/pressure/explosive/rad/live = 30, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield = 2 - ) - mob_spawn_list = list( //nor organics, more biased towards hivebots though - /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50, - /mob/living/simple_animal/bot/firebot/rockplanet = 15, - /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3, - /mob/living/simple_animal/hostile/abandoned_minebot = 15, - /mob/living/simple_animal/bot/floorbot/rockplanet = 15, - /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20, - /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10, - /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5, - /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2 - ) - -/datum/biome/waste/metal/rust - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet/lit = 1, - /turf/open/floor/plating/wasteplanet/rust/lit = 10, - /turf/open/floor/plating/wasteplanet/lit = 4 - ) - - - -/datum/biome/cave/waste - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet = 80, - /turf/open/floor/plating/wasteplanet/rust = 15, - /turf/open/floor/plating/wasteplanet = 5 - ) - - closed_turf_types = list( - /turf/closed/mineral/random/wasteplanet = 40, - /turf/closed/wall/r_wall = 1, - /turf/closed/wall/r_wall/rust = 3, - /turf/closed/wall = 2, - /turf/closed/wall/rust = 6 - ) - - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/mechwreck = 100, - /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20, - /obj/effect/spawner/lootdrop/waste/trash = 1800, - /obj/effect/spawner/lootdrop/waste/radiation = 80, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10, - /obj/effect/spawner/lootdrop/waste/girder = 600, - /obj/structure/reagent_dispensers/fueltank = 100, - /obj/structure/reagent_dispensers/watertank = 200, - /obj/item/stack/cable_coil/cut = 500, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/atmos_can = 50, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5, - /obj/effect/spawner/lootdrop/waste/salvageable = 300, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200, - /obj/effect/spawner/lootdrop/maintenance = 20, - /obj/effect/spawner/lootdrop/maintenance/two = 50, - /obj/effect/spawner/lootdrop/maintenance/three = 100, - /obj/effect/spawner/lootdrop/maintenance/four = 200, - /obj/effect/spawner/lootdrop/waste/salvageable = 400, - /obj/structure/flora/ash/garden/waste = 70, - /obj/structure/flora/ash/glowshroom = 400, //more common in caves - /obj/item/mine/pressure/explosive/rad/live = 10, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield = 2 - ) - - feature_spawn_list = list( - /obj/effect/radiation/waste = 30, - /obj/effect/radiation/waste/intense = 10, - /obj/structure/geyser/random = 1, - /obj/effect/spawner/lootdrop/anomaly/waste/cave = 1 - ) - mob_spawn_list = list( - /mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70, - /mob/living/simple_animal/hostile/hivebot/range/rockplanet = 40, - /mob/living/simple_animal/hostile/hivebot/rapid/rockplanet = 30, - /mob/living/simple_animal/bot/firebot/rockplanet = 15, - /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3, - /mob/living/simple_animal/hostile/abandoned_minebot = 15, - /mob/living/simple_animal/bot/floorbot/rockplanet = 15, - ) - - flora_spawn_chance = 30 - feature_spawn_chance = 4 - mob_spawn_chance = 5 - -/datum/biome/cave/waste/tar_bed //tar colorings here - open_turf_types = list( - /turf/open/floor/plating/asteroid/wasteplanet = 70, - /turf/open/floor/plating/wasteplanet/rust = 20, - /turf/open/water/tar/waste = 3 - ) - -/datum/biome/cave/waste/tar_bed/full - open_turf_types = list( - /turf/open/water/tar/waste = 1 - ) - flora_spawn_chance = 0 - -/datum/biome/cave/waste/rad - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/trash = 900, - /obj/effect/spawner/lootdrop/waste/radiation = 250, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 70, - /obj/effect/spawner/lootdrop/waste/atmos_can = 50, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5, - /obj/effect/spawner/lootdrop/waste/salvageable = 150, - /obj/effect/spawner/lootdrop/waste/girder = 200, - /obj/structure/reagent_dispensers/fueltank = 10, - /obj/structure/reagent_dispensers/watertank = 10, - /obj/item/stack/cable_coil/cut = 500, - /obj/structure/closet/crate/secure/loot = 30, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200, - /obj/effect/spawner/lootdrop/maintenance = 20, - /obj/effect/spawner/lootdrop/maintenance/two = 50, - /obj/effect/spawner/lootdrop/maintenance/three = 100, - /obj/effect/spawner/lootdrop/maintenance/four = 200, - /obj/structure/flora/ash/glowshroom = 1800, - /obj/item/mine/pressure/explosive/rad/live = 30, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield = 2 - ) - feature_spawn_chance = 12 - -/datum/biome/cave/waste/metal //deeper in, there's no normal stuff here - open_turf_types = list( - /turf/open/floor/plating/wasteplanet/rust = 10, - /turf/open/floor/plating/wasteplanet = 4 - ) - closed_turf_types = list( - /turf/closed/wall/r_wall = 1, - /turf/closed/wall/r_wall/rust = 1, - /turf/closed/wall = 5, - /turf/closed/wall/rust = 10 - ) - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/mechwreck = 40, - /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 10, - /obj/effect/spawner/lootdrop/waste/trash = 180, - /obj/effect/spawner/lootdrop/waste/radiation = 32, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 4, - /obj/effect/spawner/lootdrop/waste/girder = 120, - /obj/structure/reagent_dispensers/fueltank = 20, - /obj/structure/reagent_dispensers/watertank = 40, - /obj/item/stack/cable_coil/cut = 100, - /obj/structure/closet/crate/secure/loot = 6, - /obj/effect/spawner/lootdrop/waste/atmos_can = 10, - /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1, - /obj/effect/spawner/lootdrop/waste/salvageable = 60, - /obj/effect/spawner/lootdrop/waste/grille_or_trash = 40, - /obj/effect/spawner/lootdrop/maintenance = 4, - /obj/effect/spawner/lootdrop/maintenance/two = 10, - /obj/effect/spawner/lootdrop/maintenance/three = 20, - /obj/effect/spawner/lootdrop/maintenance/four = 40, - /obj/effect/spawner/lootdrop/waste/salvageable = 80, - /obj/item/mine/proximity/spawner/manhack/live = 40, - /obj/effect/spawner/lootdrop/mine = 8, - /obj/effect/spawner/minefield/manhack = 2 - ) - mob_spawn_list = list( //nor organics, more biased towards hivebots though - /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50, - /mob/living/simple_animal/bot/firebot/rockplanet = 15, - /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3, - /mob/living/simple_animal/hostile/abandoned_minebot = 15, - /mob/living/simple_animal/bot/floorbot/rockplanet = 15, - /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20, - /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10, - /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5, - /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2 - ) - -/datum/biome/cave/waste/metal/hivebot - flora_spawn_list = list( - /obj/effect/spawner/lootdrop/waste/trash = 90, - /obj/effect/spawner/lootdrop/waste/radiation = 16, - /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2, - /obj/effect/spawner/lootdrop/waste/girder = 60, - /obj/structure/reagent_dispensers/fueltank = 10, - /obj/structure/reagent_dispensers/watertank = 20, - /obj/item/stack/cable_coil/cut = 50, - /obj/structure/closet/crate/secure/loot = 3, - /obj/effect/spawner/lootdrop/maintenance = 2, - /obj/effect/spawner/lootdrop/maintenance/two = 5, - /obj/effect/spawner/lootdrop/maintenance/three = 10, - /obj/effect/spawner/lootdrop/maintenance/four = 20, - /obj/effect/spawner/lootdrop/waste/salvageable = 40, - /obj/structure/foamedmetal = 100, - /obj/item/mine/proximity/spawner/manhack/live = 20 - ) - mob_spawn_list = list( //Whoops! All hivebots! - /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50, - /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50, - - ) - mob_spawn_chance = 30 - feature_spawn_list = list( - /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20, - /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10, - /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5, - /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2, - /obj/effect/spawner/minefield/manhack = 2 - ) - feature_spawn_chance = 2 //hivebot biomes should have their dongles diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index b3b622f85b3..53ac415db9f 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -56,6 +56,14 @@ var/drill_sound = 'sound/effects/fighting/Genhit.ogg' var/drill_verb = "picking" +/obj/item/pickaxe/rusty + name = "rusty pickaxe" + desc = "A pickaxe that's been left to rust." + attack_verb = list("ineffectively hit") + force = 7 + armor_penetration = 30 + sharp = 0 + /obj/item/pickaxe/drill name = "mining drill" //Can dig sand as well! icon_state = "handdrill" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 3b927f29035..bdffc48af55 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -560,6 +560,7 @@ var/list/mining_floors = list() temperature = TCMB var/dug = 0 //0 = has not yet been dug, 1 = has already been dug var/overlay_detail + var/floor_variance = 0 has_resources = 1 footstep_sound = SFX_FOOTSTEP_ASTEROID @@ -759,3 +760,249 @@ var/list/mining_floors = list() footstep_sound = SFX_FOOTSTEP_WATER temperature = 30 CELSIUS initial_gas = list("oxygen" = 1.05 * MOLES_O2STANDARD, "nitrogen" = 1.05 * MOLES_N2STANDARD, "carbon_dioxide" = MOLES_CELLSTANDARD * 0.1) + +/turf/simulated/floor/asteroid/jungle + name = "grass" + desc = "A dirty surface completly covered in low, dense grass. It looks nice." + icon = 'icons/turf/grass.dmi' + icon_state = "grass_green" + footstep_sound = SFX_FOOTSTEP_GRASS + +/turf/simulated/floor/asteroid/jungle/dirt + name = "dirt" + desc = "Looks dirty." + icon_state = "dirt" + +/turf/simulated/floor/asteroid/jungle/water + name = "water" + desc = "Looks wet." + icon = 'icons/misc/beach.dmi' + icon_state = "seashallow" + footstep_sound = SFX_FOOTSTEP_SWAMP + var/overlay = TRUE + +/turf/simulated/floor/asteroid/jungle/water/Initialize() + . = ..() + if(overlay) + AddOverlays(image("icon"='icons/misc/beach.dmi',"icon_state"="riverwater","layer"=MOB_LAYER+1)) + +/turf/simulated/floor/asteroid/jungle/water/update_dirt() + return + +/turf/simulated/floor/asteroid/jungle/wasteland + name = "cracked earth" + desc = "Looks a bit dry." + icon = 'icons/turf/flooring/wasteland.dmi' + icon_state = "wasteland1" + floor_variance = 15 + +/turf/simulated/floor/asteroid/jungle/wasteland/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "wasteland[rand(1, 13)]" + +/turf/simulated/floor/asteroid/rockplanet + name = "iron sand" + desc = "Reddish sand, probably because it contain too much iron in it." + icon = 'icons/turf/flooring/sand.dmi' + icon_state = "dry_soft1" + floor_variance = 100 + +/turf/simulated/floor/asteroid/rockplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "dry_soft[rand(1, 8)]" + +/turf/simulated/floor/asteroid/rockplanet/cracked + name = "iron cracked sand" + icon_state = "dry_cracked1" + +/turf/simulated/floor/asteroid/rockplanet/cracked/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "dry_cracked[rand(1, 8)]" + +/turf/simulated/floor/asteroid/rockplanet/wet + icon_state = "wet_soft1" + +/turf/simulated/floor/asteroid/rockplanet/wet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "wet_soft[rand(1, 8)]" + +/turf/simulated/floor/asteroid/rockplanet/wet/cracked + name = "iron cracked sand" + icon_state = "wet_cracked1" + +/turf/simulated/floor/asteroid/rockplanet/wet/cracked/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "wet_cracked[rand(1, 8)]" + +/turf/simulated/floor/asteroid/whitesands + name = "salted sand" + desc = "Dead-white sand that made almost entirely out of salt." + icon = 'icons/turf/flooring/whitesand.dmi' + icon_state = "sand1" + floor_variance = 80 + +/turf/simulated/floor/asteroid/whitesands/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "sand[rand(1, 13)]" + +/turf/simulated/floor/asteroid/whitesands/dried + icon_state = "dry1" + +/turf/simulated/floor/asteroid/whitesands/dried/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "dry[rand(1, 13)]" + +/turf/simulated/floor/asteroid/whitesands/grass + name = "purple grass" + desc = "The few known flora on Whitesands are in a purplish color." + icon = 'icons/turf/grass.dmi' + icon_state = "grass_purple" + footstep_sound = SFX_FOOTSTEP_GRASS + +/turf/simulated/floor/asteroid/whitesands/grass/dead + name = "dry grass" + icon = 'icons/turf/grass.dmi' + icon_state = "grass_white" + desc = "The few known flora on Whitesands also don't tend to live for very long, especially after the war." + +/turf/simulated/floor/asteroid/snow + name = "snow" + desc = "Just a snow." + icon = 'icons/turf/planetsnow.dmi' + icon_state = "snow1" + footstep_sound = SFX_FOOTSTEP_SNOW + floor_variance = 100 + +/turf/simulated/floor/asteroid/snow/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "snow[rand(1, 13)]" + +/turf/simulated/floor/asteroid/snow/icerock + name = "icy rock" + desc = "The coarse rock that covers the surface." + icon_state = "icemoon_ground_coarse1" + footstep_sound = SFX_FOOTSTEP_ASTEROID + floor_variance = 100 + +/turf/simulated/floor/asteroid/snow/icerock/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "icemoon_ground_coarse[rand(1, 8)]" + +/turf/simulated/floor/asteroid/snow/icerock/smooth + icon_state = "icemoon_ground_smooth" + +/turf/simulated/floor/asteroid/snow/icerock/cracked + icon_state = "icemoon_ground_cracked" + +/turf/simulated/floor/asteroid/snow/iceberg + name = "cracked ice floor" + desc = "A sheet of solid ice. It seems too cracked to be slippery anymore." + icon_state = "iceberg1" + floor_variance = 100 + +/turf/simulated/floor/asteroid/snow/iceberg/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "iceberg[rand(1, 8)]" + +/turf/simulated/floor/asteroid/basalt + name = "volcanic floor" + desc = "Some dark, rough volcanic rock." + icon = 'icons/turf/basalt.dmi' + icon_state = "basalt1" + footstep_sound = SFX_FOOTSTEP_PLATING + floor_variance = 20 + +/turf/simulated/floor/asteroid/basalt/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "basalt[rand(1, 13)]" + +/turf/simulated/floor/asteroid/basalt/lavaplanet + +/turf/simulated/floor/asteroid/basalt/purple + name = "purple volcanic floor" + desc = "Dark volcanic rock, tinted by the chemicals in the atmosphere to an uncanny shade of purple." + icon = 'icons/turf/basalt_purple.dmi' + icon_state = "basalt1" + +/turf/simulated/floor/asteroid/basalt/purple/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "basalt[rand(1, 13)]" + +/turf/simulated/floor/asteroid/basalt/purple/sand + name = "ashen sand" + desc = "Sand, tinted by the chemicals in the atmosphere to an uncanny shade of purple." + icon = 'icons/turf/basalt_purple.dmi' + icon_state = "sand1" + footstep_sound = SFX_FOOTSTEP_ASTEROID + +/turf/simulated/floor/asteroid/basalt/purple/sand/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(floor_variance)) + icon_state = "sand[rand(1, 13)]" + +/turf/simulated/floor/asteroid/lavaplanet/grass + name = "red grass" + desc = "Common grass, tinged to unnatural colours by chemicals in the atmosphere." + icon = 'icons/turf/grass.dmi' + icon_state = "grass_red" + +/turf/simulated/floor/asteroid/lavaplanet/grass/purple + name = "purple grass" + icon_state = "grass_purple" + +/turf/simulated/floor/asteroid/lavaplanet/grass/orange + name = "orange grass" + icon_state = "grass_orange" + +/turf/simulated/floor/asteroid/beach + name = "sand" + desc = "Looks sandy." + icon = 'icons/misc/beach.dmi' + icon_state = "desert0" + floor_variance = 35 + +/turf/simulated/floor/asteroid/beach/Initialize() + . = ..() + if(prob(floor_variance)) + icon_state = "desert[rand(0, 8)]" + +/turf/simulated/floor/asteroid/beach/grass + name = "grass" + desc = "Light grass that grows on sandy surface." + icon = 'icons/turf/grass.dmi' + icon_state = "grass_green" + footstep_sound = SFX_FOOTSTEP_GRASS + +/turf/simulated/floor/asteroid/beach/grass/fairy + name = "fairygrass" + desc = "Something about this grass makes you want to frolic. Or get high." + icon = 'icons/turf/grass.dmi' + icon_state = "grass_cyan" + +/turf/simulated/floor/asteroid/beach/water + name = "water" + desc = "Looks wet." + icon = 'icons/misc/beach.dmi' + icon_state = "seashallow" + footstep_sound = SFX_FOOTSTEP_SWAMP + var/overlay = TRUE + +/turf/simulated/floor/asteroid/beach/water/Initialize() + . = ..() + if(overlay) + AddOverlays(image("icon"='icons/misc/beach.dmi',"icon_state"="riverwater","layer"=MOB_LAYER+1)) + +/turf/simulated/floor/asteroid/beach/water/update_dirt() + return diff --git a/icons/obj/flora/aridtrees.dmi b/icons/obj/flora/aridtrees.dmi new file mode 100644 index 00000000000..8b36fb12fe3 Binary files /dev/null and b/icons/obj/flora/aridtrees.dmi differ diff --git a/icons/obj/flora/barren_tree.dmi b/icons/obj/flora/barren_tree.dmi new file mode 100644 index 00000000000..ebf666dff8e Binary files /dev/null and b/icons/obj/flora/barren_tree.dmi differ diff --git a/icons/obj/flora/grasssticks.dmi b/icons/obj/flora/grasssticks.dmi new file mode 100644 index 00000000000..055382b0fa8 Binary files /dev/null and b/icons/obj/flora/grasssticks.dmi differ diff --git a/icons/obj/flora/hellflora.dmi b/icons/obj/flora/hellflora.dmi new file mode 100644 index 00000000000..403570c1248 Binary files /dev/null and b/icons/obj/flora/hellflora.dmi differ diff --git a/icons/obj/flora/jungleflora.dmi b/icons/obj/flora/jungleflora.dmi index 55b9901215f..b24fa844f48 100644 Binary files a/icons/obj/flora/jungleflora.dmi and b/icons/obj/flora/jungleflora.dmi differ diff --git a/icons/obj/flora/junglevines.dmi b/icons/obj/flora/junglevines.dmi index c678e19ef31..c09f4550705 100644 Binary files a/icons/obj/flora/junglevines.dmi and b/icons/obj/flora/junglevines.dmi differ diff --git a/icons/obj/flora/junglebushlarge.dmi b/icons/obj/flora/largejungleflora.dmi similarity index 98% rename from icons/obj/flora/junglebushlarge.dmi rename to icons/obj/flora/largejungleflora.dmi index d8457d2e626..bba0fd29f62 100644 Binary files a/icons/obj/flora/junglebushlarge.dmi and b/icons/obj/flora/largejungleflora.dmi differ diff --git a/icons/obj/flora/snowflora.dmi b/icons/obj/flora/snowflora.dmi index 11cbf5a5053..418cb41fa88 100644 Binary files a/icons/obj/flora/snowflora.dmi and b/icons/obj/flora/snowflora.dmi differ diff --git a/icons/obj/flora/tall_trees_dead.dmi b/icons/obj/flora/tall_trees_dead.dmi new file mode 100644 index 00000000000..15000ab78c9 Binary files /dev/null and b/icons/obj/flora/tall_trees_dead.dmi differ diff --git a/icons/turf/asteroid.dmi b/icons/turf/asteroid.dmi index 7d5ae32506b..ee9d88e14d9 100644 Binary files a/icons/turf/asteroid.dmi and b/icons/turf/asteroid.dmi differ diff --git a/icons/turf/basalt.dmi b/icons/turf/basalt.dmi new file mode 100644 index 00000000000..9651d707299 Binary files /dev/null and b/icons/turf/basalt.dmi differ diff --git a/icons/turf/basalt_purple.dmi b/icons/turf/basalt_purple.dmi new file mode 100644 index 00000000000..ab86d1433a2 Binary files /dev/null and b/icons/turf/basalt_purple.dmi differ diff --git a/icons/turf/flooring/sand.dmi b/icons/turf/flooring/sand.dmi index 067e5725b1e..24335ea91bc 100644 Binary files a/icons/turf/flooring/sand.dmi and b/icons/turf/flooring/sand.dmi differ diff --git a/icons/turf/flooring/wasteland.dmi b/icons/turf/flooring/wasteland.dmi new file mode 100644 index 00000000000..fd964f78f77 Binary files /dev/null and b/icons/turf/flooring/wasteland.dmi differ diff --git a/icons/turf/flooring/whitesand.dmi b/icons/turf/flooring/whitesand.dmi new file mode 100644 index 00000000000..e769c9a1f4c Binary files /dev/null and b/icons/turf/flooring/whitesand.dmi differ diff --git a/icons/turf/grass.dmi b/icons/turf/grass.dmi new file mode 100644 index 00000000000..66bfab4d6af Binary files /dev/null and b/icons/turf/grass.dmi differ diff --git a/icons/turf/ice.dmi b/icons/turf/ice.dmi index 905892de647..c59ba1dd08b 100644 Binary files a/icons/turf/ice.dmi and b/icons/turf/ice.dmi differ diff --git a/icons/turf/planetsnow.dmi b/icons/turf/planetsnow.dmi new file mode 100644 index 00000000000..316690e4188 Binary files /dev/null and b/icons/turf/planetsnow.dmi differ diff --git a/maps/frontier/biodome/forest.dmm b/maps/frontier/biodome/forest.dmm index 547c0187d40..218e80fc230 100644 --- a/maps/frontier/biodome/forest.dmm +++ b/maps/frontier/biodome/forest.dmm @@ -16,7 +16,7 @@ "gi" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "gW" = (/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/jungleflora/bushb,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "hk" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/effect/floor_decal/corner/green{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/railing/steel{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome) -"hH" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/jungleplants/junglebushlarge/bush3,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) +"hH" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/jungleflora/large/bush2,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "io" = (/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/corner/green{dir = 9},/obj/effect/floor_decal/corner/green{dir = 6},/obj/machinery/door/airlock/glass{name = "Central Biodome"; req_access = list()},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome) "it" = (/obj/structure/flora/ausbushes/genericbush,/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/jungleflora/bushb,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "iV" = (/obj/structure/flora/ausbushes/fullgrass,/obj/machinery/light,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) @@ -30,7 +30,7 @@ "mV" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "mX" = (/obj/structure/flora/tree/green/small,/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "oq" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/sunnybush,/obj/machinery/light{dir = 4},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) -"oL" = (/obj/structure/flora/ausbushes/sparsegrass,/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/structure/flora/jungleplants/junglebushlarge/bush2,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) +"oL" = (/obj/structure/flora/ausbushes/sparsegrass,/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/structure/flora/ausbushes/jungleflora/large/bush1,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "oX" = (/obj/structure/flora/tree/green/small/tree4,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "pg" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/machinery/light{dir = 4},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "ph" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/effect/floor_decal/corner/green{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/railing/steel{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome) @@ -47,7 +47,7 @@ "tT" = (/obj/structure/flora/tree/green/small/tree1,/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "ua" = (/obj/structure/flora/ausbushes/fullgrass,/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "uQ" = (/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/leafybush,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) -"uR" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/jungleplants/junglebushlarge/bush4,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 1},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) +"uR" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/jungleflora/large/bush3,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 1},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "uU" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/jungleflora/bushc,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "uX" = (/obj/effect/floor_decal/corner/green{dir = 5},/obj/effect/floor_decal/corner/green{dir = 10},/obj/machinery/navbeacon/frontier/DOME_N,/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome) "vC" = (/obj/effect/floor_decal/spline/fancy{dir = 1},/obj/machinery/light,/obj/machinery/camera/network/civilian_east{c_tag = "Central Garden - North"; dir = 1},/turf/simulated/floor/water/fountain,/area/hydroponics/biodome) @@ -73,7 +73,7 @@ "EY" = (/obj/effect/floor_decal/corner/green{dir = 9},/obj/effect/floor_decal/corner/green{dir = 6},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/white{icon_state = "0-2"},/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome) "Fb" = (/obj/effect/landmark/event/rift/spawn_point,/turf/simulated/wall/gold,/area/hydroponics/biodome) "Fw" = (/obj/structure/flora/ausbushes/pointybush,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) -"FS" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/jungleplants/junglebushlarge/bush1,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) +"FS" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/jungleflora/large/bush1,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "II" = (/obj/structure/flora/ausbushes/reedbush,/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "Jl" = (/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 4},/turf/simulated/floor/natural/grass,/area/hydroponics/biodome) "JJ" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/effect/floor_decal/corner/green{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/rough,/area/hydroponics/biodome)