From c325b0d95a3af3ac095839ea6b54dbf1b11ab06d Mon Sep 17 00:00:00 2001 From: Bjarl <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:50:18 -0400 Subject: [PATCH 01/10] guh --- code/__DEFINES/colors.dm | 12 +++ .../mapgen/single_biome/WasteplanetCaves.dm | 67 --------------- code/game/objects/effects/glowshroom.dm | 3 +- code/game/turfs/open/floor/fancy_floor.dm | 2 +- code/game/turfs/open/floor/plating/beach.dm | 18 ++-- code/game/turfs/open/floor/plating/icemoon.dm | 26 +++--- code/game/turfs/open/floor/plating/jungle.dm | 57 +++++++++++++ .../game/turfs/open/floor/plating/lavaland.dm | 56 ++++++++---- .../turfs/open/floor/plating/misc_plating.dm | 85 ------------------- code/game/turfs/open/floor/plating/planet.dm | 60 ------------- .../turfs/open/floor/plating/rockplanet.dm | 43 +++++++--- .../turfs/open/floor/plating/wasteplanet.dm | 75 ++++++++-------- .../turfs/open/floor/plating/whitesands.dm | 21 +++-- code/modules/mapping/mapping_helpers.dm | 8 -- shiptest.dme | 1 + 15 files changed, 223 insertions(+), 311 deletions(-) delete mode 100644 code/datums/mapgen/single_biome/WasteplanetCaves.dm create mode 100644 code/game/turfs/open/floor/plating/jungle.dm diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 5c6f14c887eb..64f2c2b3841e 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -173,3 +173,15 @@ /// Color used for default blood #define COLOR_BLOOD "#CC0000" + + +/*Planetary color defines*/ + +#define COLOR_BEACHPLANET_LIGHT "#FAE1AF" +#define COLOR_ICEPLANET_LIGHT "#7DE1E1" //subject to change +#define COLOR_LAVAPLANET_LIGHT "#FAA019" +#define COLOR_JUNGLEPLANET_LIGHT "#bf8e60" //also subject to change +#define COLOR_ROCKPLANET_LIGHT "#EEEEEE" //EEEEEEEEEE +#define COLOR_SANDPLANET_LIGHT "#CEB689" //way subject to change +///A non-satured red, leaning towards pink. +#define COLOR_WASTEPLANET_LIGHT "#FA644B" diff --git a/code/datums/mapgen/single_biome/WasteplanetCaves.dm b/code/datums/mapgen/single_biome/WasteplanetCaves.dm deleted file mode 100644 index 08f63ba3149a..000000000000 --- a/code/datums/mapgen/single_biome/WasteplanetCaves.dm +++ /dev/null @@ -1,67 +0,0 @@ -/datum/map_generator/single_biome/wasteplanet - initial_closed_chance = 45 - smoothing_iterations = 50 - birth_limit = 4 - death_limit = 3 - - biome_type = /datum/biome/cave/wasteplanet - area_type = /area/overmap_encounter/planetoid/wasteplanet - -/datum/biome/cave/wasteplanet - open_turf_types = list(/turf/open/floor/plating/asteroid/wasteplanet = 50, - /turf/open/floor/plating/rust/wasteplanet = 10, - /turf/open/floor/plating/wasteplanet = 5) - closed_turf_types = list(/turf/closed/mineral/random/wasteplanet = 45, - /turf/closed/wall/rust = 10,) - - flora_spawn_list = list( - /obj/structure/mecha_wreckage/ripley = 15, - /obj/structure/mecha_wreckage/ripley/firefighter = 9, - /obj/structure/mecha_wreckage/ripley/mkii = 9, - /obj/structure/girder = 60, - /obj/structure/reagent_dispensers/fueltank = 30, - /obj/item/stack/cable_coil/cut = 30, - /obj/effect/decal/cleanable/greenglow = 60, - /obj/effect/decal/cleanable/glass = 30, - /obj/structure/closet/crate/secure/loot = 3, - /obj/machinery/portable_atmospherics/canister/toxins = 3, - /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3, - /obj/structure/radioactive = 6, - /obj/structure/radioactive/stack = 6, - /obj/structure/radioactive/waste = 6, - /obj/structure/flora/ash/garden/waste = 15, - /obj/structure/flora/ash/glowshroom = 90, - - /obj/structure/salvageable/machine = 20, - /obj/structure/salvageable/autolathe = 15, - /obj/structure/salvageable/computer = 10, - /obj/structure/salvageable/protolathe = 10, - /obj/structure/salvageable/circuit_imprinter = 8, - /obj/structure/salvageable/destructive_analyzer = 8, - /obj/structure/salvageable/server = 8, - /obj/item/mine/pressure/explosive/rusty/live = 30, - /obj/effect/spawner/lootdrop/mine = 8 - ) - feature_spawn_list = list( - /obj/structure/geyser/random = 1, - /obj/effect/spawner/minefield = 1 - ) - mob_spawn_list = list( - //hivebots, not too difficult - /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, - //crystal mobs, very difficult - /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1, - /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1, - /mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1, - //bots, are hostile - /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 = 10 - feature_spawn_chance = 0.1 - mob_spawn_chance = 2 diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index f880b95497c4..dd7c5dfb3913 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -16,8 +16,7 @@ var/spreadIntoAdjacentChance = 60 var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom var/static/list/blacklisted_glowshroom_turfs = typecacheof(list( - /turf/open/lava, - /turf/open/floor/plating/beach/water)) + /turf/open/lava,)) /obj/structure/glowshroom/glowcap name = "glowcap" diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 3a0184849450..2d043371a9bb 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -135,7 +135,7 @@ icon_state = "fairygrass[rand(0,3)]" /turf/open/floor/grass/fairy/beach - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand planetary_atmos = TRUE /turf/open/floor/grass/snow diff --git a/code/game/turfs/open/floor/plating/beach.dm b/code/game/turfs/open/floor/plating/beach.dm index 88bb3bbcad1b..485a5cc58a8c 100644 --- a/code/game/turfs/open/floor/plating/beach.dm +++ b/code/game/turfs/open/floor/plating/beach.dm @@ -1,13 +1,15 @@ +///it's all sand.... + /turf/open/floor/plating/asteroid/sand name = "sand" icon = 'icons/misc/beach.dmi' icon_state = "sand" base_icon_state = "sand" baseturfs = /turf/open/floor/plating/asteroid/sand - initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot? - digResult = /obj/item/stack/ore/glass + initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = TRUE digResult = /obj/item/stack/ore/glass/beach + light_color = COLOR_BEACHPLANET_LIGHT /turf/open/floor/plating/asteroid/sand/Initialize(mapload, inherited_virtual_z) . = ..() @@ -16,14 +18,20 @@ /turf/open/floor/plating/asteroid/sand/lit light_range = 2 light_power = 0.80 - light_color = LIGHT_COLOR_TUNGSTEN /turf/open/floor/plating/asteroid/sand/dense icon_state = "light_sand" - planetary_atmos = TRUE base_icon_state = "light_sand" /turf/open/floor/plating/asteroid/sand/dense/lit light_range = 2 light_power = 0.80 - light_color = LIGHT_COLOR_TUNGSTEN + +/turf/open/floor/plating/grass/beach + baseturfs = /turf/open/floor/plating/asteroid/sand + light_color = COLOR_BEACHPLANET_LIGHT + planetary_atmos = TRUE + +/turf/open/floor/plating/grass/beach/lit + light_range = 2 + light_power = 0.80 diff --git a/code/game/turfs/open/floor/plating/icemoon.dm b/code/game/turfs/open/floor/plating/icemoon.dm index ca1819af2531..19efc3fb1c83 100644 --- a/code/game/turfs/open/floor/plating/icemoon.dm +++ b/code/game/turfs/open/floor/plating/icemoon.dm @@ -17,6 +17,7 @@ bullet_sizzle = TRUE bullet_bounce_sound = null digResult = /obj/item/stack/sheet/mineral/snow + light_color = COLOR_ICEPLANET_LIGHT // footprint vars var/entered_dirs var/exited_dirs @@ -87,19 +88,17 @@ . = ..() ScrapeAway() +/turf/open/floor/plating/asteroid/snow/icemoon + baseturfs = /turf/open/openspace/icemoon + initial_gas_mix = ICEMOON_DEFAULT_ATMOS + + slowdown = 0 + /turf/open/floor/plating/asteroid/snow/lit light_range = 2 light_power = 1 baseturfs = /turf/open/floor/plating/asteroid/icerock/lit -/turf/open/floor/plating/asteroid/snow/lit/whitesands - baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit - initial_gas_mix = WHITESANDS_ATMOS - -/turf/open/floor/plating/asteroid/snow/lit/rockplanet - baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS - /turf/open/floor/plating/asteroid/snow/airless initial_gas_mix = AIRLESS_ATMOS @@ -142,6 +141,7 @@ floor_variance = 100 max_icon_states = 7 dug = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/icerock/lit light_range = 2 @@ -183,21 +183,17 @@ floor_variance = 100 max_icon_states = 7 dug = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/iceberg/lit light_range = 2 light_power = 1 - -/turf/open/floor/plating/asteroid/snow/icemoon - baseturfs = /turf/open/openspace/icemoon - initial_gas_mix = ICEMOON_DEFAULT_ATMOS - slowdown = 0 - /turf/open/lava/plasma/ice_moon initial_gas_mix = ICEMOON_DEFAULT_ATMOS baseturfs = /turf/open/lava/plasma/ice_moon planetary_atmos = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/snow/ice name = "icy snow" @@ -213,6 +209,8 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY max_icon_states = 7 + light_color = COLOR_ICEPLANET_LIGHT + /turf/open/floor/plating/asteroid/snow/ice/icemoon baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon diff --git a/code/game/turfs/open/floor/plating/jungle.dm b/code/game/turfs/open/floor/plating/jungle.dm new file mode 100644 index 000000000000..79121704001c --- /dev/null +++ b/code/game/turfs/open/floor/plating/jungle.dm @@ -0,0 +1,57 @@ +/turf/open/floor/plating/dirt/jungle + slowdown = 0.5 + baseturfs = /turf/open/floor/plating/dirt/jungle + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + light_color = COLOR_JUNGLEPLANET_LIGHT + +/turf/open/floor/plating/dirt/jungle/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/dark + icon_state = "greenerdirt" + baseturfs = /turf/open/floor/plating/dirt/jungle/dark + +/turf/open/floor/plating/dirt/jungle/dark/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona. + name = "cracked earth" + desc = "Looks a bit dry." + icon = 'icons/turf/floors.dmi' + icon_state = "wasteland" + slowdown = 1 + baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland + var/floor_variance = 15 + +/turf/open/floor/plating/dirt/jungle/wasteland/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z) + .=..() + if(prob(floor_variance)) + icon_state = "[initial(icon_state)][rand(0,12)]" + +/turf/open/floor/plating/grass/jungle + name = "jungle grass" + planetary_atmos = TRUE + desc = "Greener on the other side." + icon_state = "junglegrass" + base_icon_state = "junglegrass" + smooth_icon = 'icons/turf/floors/junglegrass.dmi' + baseturfs = /turf/open/floor/plating/grass/jungle + light_color = COLOR_JUNGLEPLANET_LIGHT + +/turf/open/floor/plating/grass/jungle/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/lit + light_range = 2 + light_power = 1 + +/turf/open/water/jungle/lit + light_range = 2 + light_power = 0.8 + light_color = LIGHT_COLOR_BLUEGREEN diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm index 84e0173819b7..c41ce597c287 100644 --- a/code/game/turfs/open/floor/plating/lavaland.dm +++ b/code/game/turfs/open/floor/plating/lavaland.dm @@ -1,3 +1,5 @@ +///baseturf + /turf/open/floor/plating/asteroid/basalt name = "volcanic floor" baseturfs = /turf/open/floor/plating/asteroid/basalt @@ -11,7 +13,6 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE /turf/open/floor/plating/asteroid/basalt/lava //lava underneath baseturfs = /turf/open/lava/smooth @@ -26,11 +27,9 @@ /proc/set_basalt_light(turf/open/floor/B) switch(B.icon_state) if("basalt1", "basalt2", "basalt3") - B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light + B.set_light(2, 0.6, COLOR_LAVAPLANET_LIGHT) //more light if("basalt5", "basalt9") - B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything! - -///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground. + B.set_light(1.4, 0.6, COLOR_LAVAPLANET_LIGHT) //barely anything! /turf/open/floor/plating/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -47,7 +46,8 @@ /turf/open/floor/plating/asteroid/basalt/purple/lit light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + +///Sand /turf/open/floor/plating/asteroid/purple name = "ashen sand" @@ -57,11 +57,13 @@ turf_type = /turf/open/floor/plating/asteroid/basalt/purple initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/asteroid/purple/lit light_range = 2 light_power = 0.3 - light_color = LIGHT_COLOR_FIRE + +///Grass /turf/open/floor/plating/grass/lava name = "ungodly grass" @@ -75,7 +77,7 @@ smooth_icon = 'icons/turf/floors/lava_grass_red.dmi' light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT gender = PLURAL /turf/open/floor/plating/grass/lava/orange @@ -88,44 +90,68 @@ icon = 'icons/turf/floors/lava_grass_purple.dmi' smooth_icon = 'icons/turf/floors/lava_grass_purple.dmi' +///The Moss +/turf/open/floor/plating/moss + name = "mossy carpet" + desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash." + baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + icon_state = "moss" + icon = 'icons/turf/lava_moss.dmi' + base_icon_state = "moss" + bullet_bounce_sound = null + footstep = FOOTSTEP_GRASS + barefootstep = FOOTSTEP_GRASS + clawfootstep = FOOTSTEP_GRASS + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + layer = HIGH_TURF_LAYER + gender = PLURAL + light_power = 1 + light_range = 2 + pixel_x = -9 + pixel_y = -9 + +///Ruin Turfs (to-do, move all ruin turfs into their own bespoke files) + /turf/open/floor/concrete/pavement/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/concrete/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/concrete/slab_1/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/rust/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plasteel/white/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plasteel/dark/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 84a49d1a0038..684420c8eb89 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -116,61 +116,6 @@ icon_state = "[icon_state][rand(1, 9)]" . = ..() - -/turf/open/floor/plating/beach - name = "beach" - icon = 'icons/misc/beach.dmi' - flags_1 = NONE - attachment_holes = FALSE - bullet_bounce_sound = null - footstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - clawfootstep = FOOTSTEP_SAND - heavyfootstep = FOOTSTEP_GENERIC_HEAVY - -/turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params) - return - -/turf/open/floor/plating/beach/ex_act(severity, target) - contents_explosion(severity, target) - -/turf/open/floor/plating/beach/sand - gender = PLURAL - name = "sand" - desc = "Surf's up." - icon_state = "sand" - baseturfs = /turf/open/floor/plating/beach/sand - -/turf/open/floor/plating/beach/coastline_t - name = "coastline" - desc = "Tide's high tonight. Charge your batons." - icon_state = "sandwater_t" - baseturfs = /turf/open/floor/plating/beach/coastline_t - -/turf/open/floor/plating/beach/coastline_b //need to make this water subtype. - name = "coastline" - icon_state = "sandwater_b" - baseturfs = /turf/open/floor/plating/beach/coastline_b - footstep = FOOTSTEP_LAVA - barefootstep = FOOTSTEP_LAVA - clawfootstep = FOOTSTEP_LAVA - heavyfootstep = FOOTSTEP_LAVA - -/turf/open/floor/plating/beach/water - gender = PLURAL - name = "water" - desc = "You get the feeling that nobody's bothered to actually make this water functional..." - icon_state = "water" - baseturfs = /turf/open/floor/plating/beach/water - footstep = FOOTSTEP_LAVA //placeholder, kinda. - barefootstep = FOOTSTEP_LAVA - clawfootstep = FOOTSTEP_LAVA - heavyfootstep = FOOTSTEP_LAVA - -/turf/open/floor/plating/beach/coastline_t/sandwater_inner - icon_state = "sandwater_inner" - baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner - /turf/open/floor/plating/ironsand gender = PLURAL name = "iron sand" @@ -331,33 +276,3 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY tiled_dirt = FALSE -/turf/open/floor/plating/grass/beach - baseturfs = /turf/open/floor/plating/beach/sand - planetary_atmos = TRUE - -/turf/open/floor/plating/grass/beach/lit - light_range = 2 - light_power = 0.80 - - - -/turf/open/floor/plating/moss - name = "mossy carpet" - desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash." - baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss - initial_gas_mix = LAVALAND_DEFAULT_ATMOS - planetary_atmos = TRUE - icon_state = "moss" - icon = 'icons/turf/lava_moss.dmi' - base_icon_state = "moss" - bullet_bounce_sound = null - footstep = FOOTSTEP_GRASS - barefootstep = FOOTSTEP_GRASS - clawfootstep = FOOTSTEP_GRASS - heavyfootstep = FOOTSTEP_GENERIC_HEAVY - layer = HIGH_TURF_LAYER - gender = PLURAL - light_power = 1 - light_range = 2 - pixel_x = -9 - pixel_y = -9 diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm index a86847ca8f78..37d307a4e16b 100644 --- a/code/game/turfs/open/floor/plating/planet.dm +++ b/code/game/turfs/open/floor/plating/planet.dm @@ -20,70 +20,11 @@ /turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params) return -/turf/open/floor/plating/dirt/jungle - slowdown = 0.5 - baseturfs = /turf/open/floor/plating/dirt/jungle - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - -/turf/open/floor/plating/dirt/jungle/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/lit - light_range = 2 - light_power = 1 - light_color = COLOR_VERY_LIGHT_GRAY - -/turf/open/floor/plating/dirt/jungle/dark - icon_state = "greenerdirt" - baseturfs = /turf/open/floor/plating/dirt/jungle/dark - -/turf/open/floor/plating/dirt/jungle/dark/lit - light_range = 2 - light_power = 1 - -/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona. - name = "cracked earth" - desc = "Looks a bit dry." - icon = 'icons/turf/floors.dmi' - icon_state = "wasteland" - slowdown = 1 - baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland - var/floor_variance = 15 - -/turf/open/floor/plating/dirt/jungle/wasteland/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit - light_range = 2 - light_power = 1 - - -/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z) - .=..() - if(prob(floor_variance)) - icon_state = "[initial(icon_state)][rand(0,12)]" - /turf/open/floor/plating/dirt/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS baseturfs = /turf/open/floor/plating/dirt/icemoon planetary_atmos = TRUE -/turf/open/floor/plating/grass/jungle - name = "jungle grass" - planetary_atmos = TRUE - desc = "Greener on the other side." - icon_state = "junglegrass" - base_icon_state = "junglegrass" - baseturfs = /turf/open/floor/plating/dirt/jungle - smooth_icon = 'icons/turf/floors/junglegrass.dmi' - baseturfs = /turf/open/floor/plating/grass/jungle - -/turf/open/floor/plating/grass/jungle/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/lit - light_range = 2 - light_power = 1 - -/turf/open/water/jungle/lit - light_range = 2 - light_power = 0.8 - light_color = LIGHT_COLOR_BLUEGREEN - /turf/open/floor/plating/dirt/old icon_state = "oldsmoothdirt" @@ -98,7 +39,6 @@ light_power = 1 light_range = 2 - /turf/open/floor/plating/dirt/dry/lit light_power = 1 light_range = 2 diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm index b6324ebbb3d8..9bc21c8778c6 100644 --- a/code/game/turfs/open/floor/plating/rockplanet.dm +++ b/code/game/turfs/open/floor/plating/rockplanet.dm @@ -9,11 +9,11 @@ baseturfs = /turf/open/floor/plating/asteroid/rockplanet turf_type = /turf/open/floor/plating/asteroid/rockplanet digResult = /obj/item/stack/ore/glass/rockplanet + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plating/asteroid/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/plating/asteroid/rockplanet/cracked name = "iron cracked sand" @@ -25,7 +25,6 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit @@ -45,83 +44,101 @@ /turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY + +//start crackhead subtyping (open reward of 1 erika token to anyone who untangles this somewhat) /turf/open/floor/plating/grass/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "dry grass" desc = "A patch of dry grass." /turf/open/floor/plating/dirt/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "mud" icon_state = "greenerdirt" /turf/open/water/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "pond" /turf/open/floor/plating/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "exterior plating" /turf/open/floor/plating/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/plasteel/stairs/rockplanet - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS name = "exterior stairs" + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/engine/hull/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT + +//i hope whoever subtyped all the rockplanet tiles like this stubs their toe so hard. /turf/open/floor/plasteel/rockplanet - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS name = "exterior floor" + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY name = "exterior floor" /turf/open/floor/plasteel/patterned/brushed/rockplanet + name = "exterior floor" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/brushed/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior floor" /turf/open/floor/plasteel/patterned/ridged/rockplanet + name = "exterior floor" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/ridged/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior floor" /turf/open/floor/plating/rust/rockplanet + name = "exterior plating" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plating/rust/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior plating" /turf/open/floor/wood/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/pod/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/engine/hull/reinforced/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT + +///snow +/turf/open/floor/plating/asteroid/snow/lit/rockplanet + light_color = COLOR_ROCKPLANET_LIGHT + baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm index 011cab93d28a..d646bd1df429 100644 --- a/code/game/turfs/open/floor/plating/wasteplanet.dm +++ b/code/game/turfs/open/floor/plating/wasteplanet.dm @@ -1,3 +1,4 @@ +///base turf /turf/open/floor/plating/asteroid/wasteplanet name = "dry rock" @@ -9,20 +10,18 @@ planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet digResult = /obj/item/stack/ore/glass/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT -/turf/open/water/tar/waste - baseturfs = /turf/open/floor/plating/asteroid/wasteplanet - planetary_atmos = TRUE - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS +/turf/open/floor/plating/asteroid/wasteplanet/lit + light_range = 2 + light_power = 0.2 -/turf/open/floor/plating/wasteplanet - baseturfs = /turf/open/floor/plating/asteroid/wasteplanet - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS +///plating turfs -/turf/open/floor/plating/rust/wasteplanet +/turf/open/floor/plating/wasteplanet baseturfs = /turf/open/floor/plating/asteroid/wasteplanet - planetary_atmos = TRUE initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return @@ -31,66 +30,70 @@ name = "rusted plating" desc = "Corrupted steel." icon_state = "plating_rust" + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/wood/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/indestructible/hierophant/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/indestructible/hierophant/two/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE - light_color = LIGHT_COLOR_FLARE - -/turf/open/water/waste - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/floor/plating/grass/wasteplanet - icon_state = "junglegrass" - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/floor/plating/dirt/old/waste - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - planetary_atmos = TRUE - -//open turfs then open lits. + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/floor/plating/wasteplanet/rust/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE -/turf/open/floor/plating/asteroid/wasteplanet/lit + +///liquids + +/turf/open/water/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/water/waste/lit //do not drink light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + +/turf/open/water/tar/waste + baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + planetary_atmos = TRUE + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/water/tar/waste/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE -/turf/open/water/waste/lit //do not drink - light_range = 2 - light_power = 0.2 - light_color = LIGHT_COLOR_FLARE +///biological-ish turfs + +/turf/open/floor/plating/grass/wasteplanet + icon_state = "junglegrass" + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/floor/plating/dirt/old/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/dirt/old/waste/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/floor/plating/grass/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm index 6d7d0e3343f9..8da74995feb2 100644 --- a/code/game/turfs/open/floor/plating/whitesands.dm +++ b/code/game/turfs/open/floor/plating/whitesands.dm @@ -1,3 +1,5 @@ +///sand (but not like the other sand that's also called sand) + /turf/open/floor/plating/asteroid/whitesands name = "salted sand" baseturfs = /turf/open/floor/plating/asteroid/whitesands @@ -6,13 +8,13 @@ icon_plating = "sand" planetary_atmos = TRUE base_icon_state = WHITESANDS_SAND_ENV - initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior + initial_gas_mix = WHITESANDS_ATMOS digResult = /obj/item/stack/ore/glass/whitesands + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/whitesands/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit /turf/open/floor/plating/asteroid/whitesands/dried @@ -29,11 +31,9 @@ /turf/open/floor/plating/asteroid/whitesands/dried/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried/lit -/turf/open/floor/plating/grass/whitesands - initial_gas_mix = WHITESANDS_ATMOS +///basalt /turf/open/floor/plating/asteroid/basalt/whitesands initial_gas_mix = WHITESANDS_ATMOS @@ -42,11 +42,14 @@ icon_state = "whitesands_basalt0" icon_plating = "whitesands_basalt0" dug = TRUE + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/basalt/whitesands/Initialize(mapload, inherited_virtual_z) . = ..() icon_state = "whitesands_basalt[rand(0,1)]" +///grass + /turf/open/floor/plating/asteroid/whitesands/grass name = "purple grass" desc = "The few known flora on Whitesands are in a purplish color." @@ -60,6 +63,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS) canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS) + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/whitesands/grass/Initialize(mapload, inherited_virtual_z) . = ..() @@ -80,3 +84,10 @@ /turf/open/floor/plating/asteroid/whitesands/grass/dead/lit light_power = 1 light_range = 2 + +///the singular snow tile: + +/turf/open/floor/plating/asteroid/snow/lit/whitesands + light_color = COLOR_SANDPLANET_LIGHT + baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit + initial_gas_mix = WHITESANDS_ATMOS diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 2040764eefb9..98134d4e9be7 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -71,14 +71,6 @@ name = "asteroid snow baseturf editor" baseturf = /turf/open/floor/plating/asteroid/snow -/obj/effect/baseturf_helper/beach/sand - name = "beach sand baseturf editor" - baseturf = /turf/open/floor/plating/beach/sand - -/obj/effect/baseturf_helper/beach/water - name = "water baseturf editor" - baseturf = /turf/open/floor/plating/beach/water - /obj/effect/baseturf_helper/lava name = "lava baseturf editor" baseturf = /turf/open/lava/smooth diff --git a/shiptest.dme b/shiptest.dme index 8288edd38bea..a0ce481d75c9 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1530,6 +1530,7 @@ #include "code\game\turfs\open\floor\plating\asteroid.dm" #include "code\game\turfs\open\floor\plating\beach.dm" #include "code\game\turfs\open\floor\plating\icemoon.dm" +#include "code\game\turfs\open\floor\plating\jungle.dm" #include "code\game\turfs\open\floor\plating\lavaland.dm" #include "code\game\turfs\open\floor\plating\misc_plating.dm" #include "code\game\turfs\open\floor\plating\planet.dm" From 7fefe3a1cd90925f7177a5dfcaaccc2e117f4408 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:29:44 -0400 Subject: [PATCH 02/10] small alterations --- code/__DEFINES/colors.dm | 7 +++---- code/game/turfs/open/floor/plating/lavaland.dm | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 64f2c2b3841e..6f2094b74ec3 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -178,10 +178,9 @@ /*Planetary color defines*/ #define COLOR_BEACHPLANET_LIGHT "#FAE1AF" -#define COLOR_ICEPLANET_LIGHT "#7DE1E1" //subject to change +#define COLOR_ICEPLANET_LIGHT "#7DE1E1" #define COLOR_LAVAPLANET_LIGHT "#FAA019" -#define COLOR_JUNGLEPLANET_LIGHT "#bf8e60" //also subject to change +#define COLOR_JUNGLEPLANET_LIGHT "#bf8e60" #define COLOR_ROCKPLANET_LIGHT "#EEEEEE" //EEEEEEEEEE -#define COLOR_SANDPLANET_LIGHT "#CEB689" //way subject to change -///A non-satured red, leaning towards pink. +#define COLOR_SANDPLANET_LIGHT "#CEB689" #define COLOR_WASTEPLANET_LIGHT "#FA644B" diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm index c41ce597c287..b15f76eabcc2 100644 --- a/code/game/turfs/open/floor/plating/lavaland.dm +++ b/code/game/turfs/open/floor/plating/lavaland.dm @@ -9,6 +9,7 @@ base_icon_state = "basalt" floor_variance = 15 digResult = /obj/item/stack/ore/glass/basalt + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit light_range = 2 From 651a33f5fcc3254d7fe66f5e51ab08adcb782958 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:50:28 -0400 Subject: [PATCH 03/10] map fixes --- .../BeachRuins/beach_crashed_engineer.dmm | 226 ++++++------------ .../BeachRuins/beach_treasure_cove.dmm | 197 ++++++++------- 2 files changed, 169 insertions(+), 254 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 971fde63cb03..4a207a8f1d34 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -16,9 +16,6 @@ light_range = 2 }, /area/ruin/unpowered) -"bp" = ( -/turf/open/floor/plating/beach/sand, -/area/overmap_encounter/planetoid/beachplanet/explored) "bv" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 1 @@ -41,9 +38,7 @@ /mob/living/simple_animal/crab{ name = "\improper Crab" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "cj" = ( /obj/structure/cable{ @@ -158,9 +153,7 @@ /mob/living/simple_animal/hostile/abandoned_minebot{ name = "\improper Abandoned Tony" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "hA" = ( /obj/structure/grille, @@ -231,9 +224,7 @@ /area/ruin/unpowered) "kH" = ( /obj/item/book/manual/wiki/construction, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "kK" = ( /obj/structure/cable{ @@ -246,9 +237,7 @@ /turf/open/floor/plating/rust, /area/ruin/unpowered) "kP" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "kR" = ( /obj/effect/turf_decal/weather/sand{ @@ -258,9 +247,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "lk" = ( /mob/living/simple_animal/hostile/asteroid/lobstrosity/beach, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "lR" = ( /obj/machinery/power/floodlight, @@ -397,9 +384,7 @@ /obj/structure/cable{ icon_state = "6-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "qK" = ( /obj/machinery/power/terminal, @@ -410,9 +395,7 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "rt" = ( /obj/effect/turf_decal/weather/sand{ @@ -433,15 +416,11 @@ /obj/structure/cable{ icon_state = "4-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sv" = ( /obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sA" = ( /obj/structure/cable{ @@ -454,9 +433,7 @@ /area/ruin/unpowered) "sB" = ( /obj/item/book/manual/wiki/engineering, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sN" = ( /obj/structure/reagent_dispensers/fueltank, @@ -475,9 +452,7 @@ /obj/structure/cable{ icon_state = "0-5" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "ty" = ( /obj/effect/turf_decal/weather/sand{ @@ -501,21 +476,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "uw" = ( /obj/structure/girder, /obj/effect/turf_decal/weather/sand, /turf/open/floor/plating/rust, /area/ruin/unpowered) -"vO" = ( -/turf/open/floor/plating/beach/sand{ - icon_state = "sand_dug"; - light_range = 2 - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "wu" = ( /obj/structure/cable{ icon_state = "2-4" @@ -539,9 +506,7 @@ "xV" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "yc" = ( /obj/effect/turf_decal/atmos/plasma, @@ -559,14 +524,6 @@ "ys" = ( /turf/template_noop, /area/template_noop) -"yv" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "yA" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 @@ -602,9 +559,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "Ae" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Ah" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -616,17 +571,13 @@ /obj/structure/cable{ icon_state = "4-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "At" = ( /obj/structure/cable{ icon_state = "5-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "AT" = ( /obj/structure/cable{ @@ -685,9 +636,7 @@ /obj/structure/cable{ icon_state = "1-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "CW" = ( /obj/machinery/suit_storage_unit/inherit, @@ -696,9 +645,7 @@ /area/ruin/unpowered) "DB" = ( /obj/item/stack/cable_coil/red, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DC" = ( /turf/open/water/beach/deep, @@ -707,15 +654,11 @@ /obj/structure/cable{ icon_state = "0-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DO" = ( /obj/structure/flora/tree/palm, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DU" = ( /obj/structure/cable{ @@ -767,9 +710,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Gj" = ( /obj/effect/decal/cleanable/glass, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Gl" = ( /turf/closed/wall/rust, @@ -796,9 +737,11 @@ /obj/structure/cable{ icon_state = "0-6" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, +/area/overmap_encounter/planetoid/beachplanet/explored) +"HH" = ( +/mob/living/simple_animal/hostile/asteroid/lobstrosity/beach, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "HK" = ( /obj/structure/closet/secure_closet/engineering_welding, @@ -817,10 +760,7 @@ "Ir" = ( /obj/item/shovel, /obj/item/stack/ore/glass/beach, -/turf/open/floor/plating/beach/sand{ - icon_state = "sand_dug"; - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "IZ" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -905,9 +845,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "LI" = ( /obj/structure/flora/rock, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Ms" = ( /obj/effect/turf_decal/weather/sand{ @@ -920,9 +858,7 @@ /area/ruin/unpowered) "Na" = ( /obj/item/pickaxe/improvised, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Nh" = ( /obj/structure/cable{ @@ -950,9 +886,7 @@ /area/ruin/unpowered) "Ot" = ( /obj/item/geiger_counter, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "OI" = ( /obj/effect/turf_decal/weather/sand{ @@ -1014,9 +948,7 @@ /obj/structure/cable{ icon_state = "6-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "QQ" = ( /obj/structure/cable{ @@ -1055,11 +987,12 @@ }, /turf/open/floor/plasteel/tech, /area/ruin/unpowered) +"RD" = ( +/turf/open/floor/plating/asteroid/sand/dense/lit, +/area/overmap_encounter/planetoid/beachplanet/explored) "Sl" = ( /obj/structure/radioactive/stack, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Sx" = ( /obj/structure/cable{ @@ -1072,9 +1005,6 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "SE" = ( /obj/structure/barricade/wooden, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, /area/ruin/unpowered) "SF" = ( /obj/structure/cable{ @@ -1101,9 +1031,7 @@ /obj/structure/cable{ icon_state = "5-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Tf" = ( /obj/structure/cable{ @@ -1122,9 +1050,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "TB" = ( /obj/effect/spawner/structure/window/hollow/directional{ @@ -1135,9 +1061,7 @@ "TI" = ( /obj/structure/radioactive/waste, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Uk" = ( /turf/open/floor/plating/grass/beach/lit, @@ -1181,9 +1105,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Wg" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Wn" = ( /obj/machinery/computer/arcade/orion_trail{ @@ -1246,9 +1168,7 @@ /obj/structure/cable{ icon_state = "0-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Yh" = ( /obj/effect/turf_decal/weather/sand{ @@ -1277,9 +1197,7 @@ /obj/structure/cable{ icon_state = "1-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "ZW" = ( /obj/machinery/pipedispenser, @@ -1597,7 +1515,7 @@ ys Ae Ae Ae -yv +Ae Uz WH WH @@ -1791,7 +1709,7 @@ Ae Ae Ae Ae -bp +Ae ys ys ys @@ -1825,7 +1743,7 @@ Ae Ae Ae Ae -bp +Ae Ae ys ys @@ -1893,7 +1811,7 @@ Ae Ae Ae Ae -bp +Ae Ae Ae ys @@ -1910,7 +1828,7 @@ ug cj Ae Ae -vO +Ae Ae Ae SF @@ -1927,7 +1845,7 @@ Ae Hp Ae Ae -bp +Ae Ae Ae Ae @@ -1961,7 +1879,7 @@ DO Ae qH Ae -bp +Ae Ae Ae Ae @@ -1969,8 +1887,8 @@ Ae (21,1,1) = {" ys ys -Ae -Ae +RD +RD iZ fT Kp @@ -1995,7 +1913,7 @@ Ae Ae Ae qH -bp +Ae Ae sB Ae @@ -2004,14 +1922,14 @@ Ae ys ys Ae -vO +RD ij tX PR dG tB -Ae -Ae +RD +RD qD qD Om @@ -2038,14 +1956,14 @@ Ae ys ys Ae -Ae -Ae +RD +RD SZ Wn Qw tB -Ae -Ae +RD +RD qD ni Qw @@ -2072,14 +1990,14 @@ Ae ys ys ys -Ae -Ae +RD +RD Gj rt kR -Ae -Ae -Ae +RD +RD +RD qD Rj JW @@ -2106,12 +2024,12 @@ Ae ys ys ys -Ae -Ae -Ae -Ae +RD +RD +RD +RD xV -Ae +RD Wg Ae qD @@ -2141,10 +2059,10 @@ ys ys ys ys -Ae -lk -Ae -Ae +RD +HH +RD +RD Ae Ae Ae diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm index 997f6bb56703..6636285186b4 100644 --- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm @@ -20,9 +20,6 @@ /area/ruin/beach/treasure_cove) "ay" = ( /obj/structure/flora/tree/palm, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, /area/ruin/unpowered) "aY" = ( /obj/structure/flora/ausbushes/reedbush, @@ -112,6 +109,9 @@ /obj/structure/flora/ausbushes/fernybush, /turf/open/floor/plating/dirt/jungle, /area/ruin/unpowered) +"eC" = ( +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "eI" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood{ @@ -194,9 +194,7 @@ /area/ruin/beach/treasure_cove) "ht" = ( /obj/effect/overlay/palmtree_r, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "hJ" = ( /obj/effect/turf_decal/industrial/traffic, @@ -207,9 +205,6 @@ /turf/open/floor/concrete/slab_1, /area/ruin/beach/treasure_cove) "hS" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, /area/ruin/unpowered) "ie" = ( /obj/structure/closet/crate/grave/loot{ @@ -300,9 +295,6 @@ /area/ruin/unpowered) "kl" = ( /obj/effect/overlay/palmtree_l, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, /area/ruin/unpowered) "km" = ( /mob/living/simple_animal/hostile/cockroach, @@ -846,6 +838,10 @@ icon_state = "panelscorched" }, /area/ruin/beach/treasure_cove) +"zE" = ( +/mob/living/simple_animal/crab, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "zW" = ( /obj/structure/flora/ausbushes/reedbush{ pixel_x = -11; @@ -1044,6 +1040,10 @@ }, /turf/open/water/beach, /area/ruin/unpowered) +"Jz" = ( +/obj/effect/overlay/palmtree_l, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "JM" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -1443,9 +1443,6 @@ /area/ruin/beach/treasure_cove) "WX" = ( /mob/living/simple_animal/crab, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, /area/ruin/unpowered) "Xp" = ( /obj/effect/turf_decal/siding/wood{ @@ -1830,10 +1827,10 @@ lt lt lt lt -hS -hS -WX -hS +eC +eC +zE +eC db EE TN @@ -1876,11 +1873,11 @@ lt lt lt lt -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC db TN TN @@ -1921,12 +1918,12 @@ lt lt lt lt -hS -hS -hS -kl -hS -hS +eC +eC +eC +Jz +eC +eC TJ bB TN @@ -1966,12 +1963,12 @@ lt lt lt lt -hS -hS -hS -WX -hS -hS +eC +eC +eC +zE +eC +eC TJ TN TN @@ -2011,10 +2008,10 @@ lt lt lt lt -hS -hS -hS -hS +eC +eC +eC +eC VF UY TN @@ -2057,8 +2054,8 @@ lt lt lt lt -hS -hS +eC +eC VF TN TN @@ -2244,7 +2241,7 @@ TN TN TN CB -hS +eC TJ TN bN @@ -2288,7 +2285,7 @@ SD xg TN bN -hS +eC lt lt TN @@ -2525,8 +2522,8 @@ hS Iv lt lt -hS -hS +eC +eC lt lt lt @@ -2570,8 +2567,8 @@ hS Iv lt lt -hS -hS +eC +eC lt lt lt @@ -2614,9 +2611,9 @@ hS (25,1,1) = {" Iv lt -hS -hS -hS +eC +eC +eC lt lt lt @@ -2659,10 +2656,10 @@ hS (26,1,1) = {" Iv Iv -hS -hS -hS -WX +eC +eC +eC +zE lt lt lt @@ -2704,8 +2701,8 @@ hS (27,1,1) = {" Iv Iv -hS -hS +eC +eC VF UY UY @@ -2749,7 +2746,7 @@ hS (28,1,1) = {" Iv Iv -hS +eC ht TJ TN @@ -2794,14 +2791,14 @@ Iv (29,1,1) = {" Iv Iv -hS -hS +eC +eC TJ TN TN TN jZ -hS +eC lt lt lt @@ -2839,15 +2836,15 @@ Iv (30,1,1) = {" Iv Iv -hS -hS +eC +eC db TN TN TN bN -WX -hS +zE +eC lt lt lt @@ -2884,9 +2881,9 @@ Iv (31,1,1) = {" Iv Iv -hS -hS -hS +eC +eC +eC db EE TN @@ -2930,10 +2927,10 @@ Iv Iv Iv lt -hS -hS -hS -WX +eC +eC +eC +zE TJ TN TN @@ -2976,9 +2973,9 @@ Iv lt lt lt -hS -hS -hS +eC +eC +eC db TN TN @@ -3022,9 +3019,9 @@ Iv Iv Iv Iv -hS -hS -hS +eC +eC +eC db EE TN @@ -3068,15 +3065,15 @@ Iv Iv lt lt -hS -hS -hS -hS +eC +eC +eC +eC db EE EE CB -hS +eC lt lt lt @@ -3114,16 +3111,16 @@ lt lt lt lt -hS -hS -hS -kl -hS -hS -hS -hS -hS -hS +eC +eC +eC +Jz +eC +eC +eC +eC +eC +eC Iv Iv Iv @@ -3160,13 +3157,13 @@ Iv Iv Iv Iv -hS -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC +eC Iv Iv Iv From e2924aeec5a311214aa4690878668ebd81f81e62 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:55:55 -0400 Subject: [PATCH 04/10] tfw baseturfs --- _maps/RandomRuins/BeachRuins/beach_float_resort.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm index bf43f3ee9f94..12f7c2148cb1 100644 --- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm @@ -57,7 +57,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "ca" = ( @@ -343,7 +343,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "jQ" = ( @@ -548,7 +548,7 @@ pixel_y = 13 }, /turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "pr" = ( @@ -1396,7 +1396,7 @@ layer = 2.01 }, /turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "Kv" = ( @@ -1548,7 +1548,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "NU" = ( @@ -1560,7 +1560,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "NV" = ( From b4484f81b3e1e2616b466cf6d83bd2726c7cd653 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:58:29 -0400 Subject: [PATCH 05/10] Update beach_ocean_town.dmm --- .../BeachRuins/beach_ocean_town.dmm | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index d1a3ff05cf04..e199ba2afe1f 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -275,7 +275,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "dT" = ( @@ -618,7 +618,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "hG" = ( @@ -953,7 +953,7 @@ layer = 2.01 }, /turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "mc" = ( @@ -991,7 +991,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "mt" = ( @@ -1132,7 +1132,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "oF" = ( @@ -1346,7 +1346,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "rN" = ( @@ -1683,7 +1683,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "wu" = ( @@ -1917,7 +1917,7 @@ layer = 2.01 }, /turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "yQ" = ( @@ -2270,7 +2270,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "De" = ( @@ -2408,7 +2408,7 @@ layer = 2.01 }, /turf/open/floor/carpet/purple{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "Eu" = ( @@ -3052,7 +3052,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "KD" = ( @@ -3171,7 +3171,7 @@ layer = 2.01 }, /turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "LR" = ( @@ -3448,7 +3448,7 @@ desc = "100% pure cotton!" }, /turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "OR" = ( @@ -3519,7 +3519,7 @@ layer = 2.01 }, /turf/open/floor/carpet/purple{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "Pv" = ( @@ -3859,7 +3859,7 @@ layer = 2.01 }, /turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "UH" = ( From 43ccc14d84e50ec4b17e4abd98eceac428dba505 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:06:56 -0400 Subject: [PATCH 06/10] stupid 2014 turfs --- .../independent/independent_lagoon.dmm | 73 ++++++++++--------- code/game/turfs/open/floor/plating/planet.dm | 19 +++++ 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 16f3ad2cbfa1..ed80259962a6 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -478,7 +478,7 @@ /turf/open/floor/pod/dark, /area/ship/hallway/port) "cP" = ( -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "cR" = ( /obj/machinery/computer/arcade/battle, @@ -592,7 +592,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "dN" = ( -/turf/open/floor/plating/beach/water, +/turf/open/water/ship, /area/ship/hallway/central) "dP" = ( /obj/effect/turf_decal/corner/opaque/white/border{ @@ -812,7 +812,7 @@ /obj/structure/flora/tree/jungle/small{ randomize_icon = 0 }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "fu" = ( /obj/structure/cable{ @@ -941,7 +941,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/turf_decal/weather/sand, /obj/machinery/light/directional/west, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "gn" = ( /obj/structure/railing{ @@ -1011,7 +1011,7 @@ /area/ship/hallway/port) "gM" = ( /obj/structure/chair/comfy/grey/directional/east, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "gR" = ( /obj/structure/sign/barsign{ @@ -1239,7 +1239,7 @@ "id" = ( /obj/effect/turf_decal/weather/sand, /obj/machinery/light/directional/east, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "ie" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -1500,7 +1500,7 @@ /area/ship/crew) "jI" = ( /obj/item/toy/seashell, -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "jM" = ( /obj/machinery/libraryscanner, @@ -2522,7 +2522,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "qx" = ( -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "qA" = ( /obj/structure/chair{ @@ -2877,7 +2877,9 @@ /turf/open/floor/light/colour_cycle/dancefloor_b, /area/ship/storage) "ta" = ( -/turf/open/floor/plating/beach/coastline_t, +/turf/open/water/ship{ + icon_state = "sandwater_t" + }, /area/ship/hallway/central) "tb" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -2964,7 +2966,7 @@ /obj/structure/chair/pew/right{ dir = 4 }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "tH" = ( /obj/structure/cable{ @@ -3027,7 +3029,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/chair/comfy/grey/directional/east, /obj/item/radio/intercom/directional/north, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "um" = ( /obj/structure/cable{ @@ -3427,7 +3429,6 @@ /area/ship/hallway/fore) "wV" = ( /obj/structure/mineral_door/sandstone, -/turf/open/floor/plating/beach/sand, /area/ship/hallway/central) "wX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -3514,7 +3515,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "xA" = ( /obj/structure/cable{ @@ -3793,7 +3794,7 @@ /area/ship/hallway/fore) "zf" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "zs" = ( /obj/structure/table/reinforced, @@ -3832,7 +3833,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "zQ" = ( /obj/structure/table/reinforced, @@ -3866,7 +3867,7 @@ /obj/structure/chair/pew/left{ dir = 4 }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "zX" = ( /obj/structure/disposalpipe/segment{ @@ -3994,7 +3995,7 @@ /area/ship/hallway/fore) "AI" = ( /obj/machinery/light/directional/south, -/turf/open/floor/plating/beach/water, +/turf/open/water/ship, /area/ship/hallway/central) "AR" = ( /obj/structure/railing{ @@ -4124,11 +4125,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "BI" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "BO" = ( /obj/machinery/door/airlock/public/glass, @@ -4486,7 +4487,7 @@ icon_state = "4-8" }, /mob/living/simple_animal/chick, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "Ej" = ( /obj/structure/table/wood/poker, @@ -4829,7 +4830,7 @@ "Gw" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "GA" = ( /obj/structure/disposalpipe/segment{ @@ -5332,7 +5333,7 @@ /area/ship/crew/janitor) "Kd" = ( /obj/item/toy/beach_ball, -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "Kh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -5501,7 +5502,7 @@ /area/ship/crew/chapel) "LD" = ( /obj/item/reagent_containers/spray/spraytan, -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "LF" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -5537,7 +5538,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "Md" = ( /obj/machinery/power/generator{ @@ -5606,7 +5607,7 @@ "Mx" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "My" = ( /obj/effect/turf_decal/corner/opaque/white/border{ @@ -6421,7 +6422,9 @@ /turf/open/floor/wood, /area/ship/crew/hydroponics) "RR" = ( -/turf/open/floor/plating/beach/coastline_b, +/turf/open/water/ship{ + icon_state = "sandwater_b" + }, /area/ship/hallway/central) "RS" = ( /obj/structure/window/plasma/reinforced/spawner/west, @@ -6599,7 +6602,7 @@ /area/ship/hallway/aft) "Tt" = ( /obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "Tw" = ( /obj/structure/cable{ @@ -6905,7 +6908,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "Vl" = ( /obj/structure/cable{ @@ -6957,7 +6960,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "VF" = ( /obj/machinery/door/airlock/external{ @@ -7167,7 +7170,7 @@ /area/ship/hallway/fore) "WW" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "WX" = ( /obj/machinery/suit_storage_unit/security, @@ -7289,7 +7292,7 @@ /area/ship/crew) "XI" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "XM" = ( /obj/machinery/airalarm/directional/north, @@ -7302,7 +7305,7 @@ pixel_x = -8; pixel_y = 4 }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "XV" = ( /obj/item/kirbyplants/photosynthetic, @@ -7363,7 +7366,7 @@ pixel_x = -13; pixel_y = 23 }, -/turf/open/floor/grass, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "Yl" = ( /obj/structure/cable{ @@ -7499,11 +7502,11 @@ "Zx" = ( /obj/structure/flora/tree/palm, /obj/effect/overlay/coconut, -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "ZA" = ( /obj/item/clothing/shoes/sandal, -/turf/open/floor/plating/beach/sand, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "ZH" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm index 37d307a4e16b..f360ac611267 100644 --- a/code/game/turfs/open/floor/plating/planet.dm +++ b/code/game/turfs/open/floor/plating/planet.dm @@ -43,3 +43,22 @@ light_power = 1 light_range = 2 + +//Artifical sand turfs +/turf/open/floor/plating/asteroid/sand/ship + name = "sand" + icon = 'icons/misc/beach.dmi' + icon_state = "sand" + base_icon_state = "sand" + baseturfs = /turf/open/floor/plating + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + digResult = null + +//artifical water turfs +/turf/open/water/ship + icon = 'icons/misc/beach.dmi' + icon_state = "water" + base_icon_state = "water" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE From 64170b2612e25d650971829bae6e8f3862eca90c Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:15:05 -0400 Subject: [PATCH 07/10] uu --- .../BeachRuins/beach_treasure_cove.dmm | 321 +++++++++--------- 1 file changed, 157 insertions(+), 164 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm index 6636285186b4..ab3c8499cdbf 100644 --- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm @@ -20,6 +20,7 @@ /area/ruin/beach/treasure_cove) "ay" = ( /obj/structure/flora/tree/palm, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "aY" = ( /obj/structure/flora/ausbushes/reedbush, @@ -204,8 +205,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/concrete/slab_1, /area/ruin/beach/treasure_cove) -"hS" = ( -/area/ruin/unpowered) "ie" = ( /obj/structure/closet/crate/grave/loot{ desc = "Here lies our great brother and infamous pirate" @@ -293,9 +292,6 @@ }, /turf/open/water/beach, /area/ruin/unpowered) -"kl" = ( -/obj/effect/overlay/palmtree_l, -/area/ruin/unpowered) "km" = ( /mob/living/simple_animal/hostile/cockroach, /turf/open/floor/wood{ @@ -1441,9 +1437,6 @@ /mob/living/simple_animal/hostile/cockroach, /turf/open/floor/plating/rust, /area/ruin/beach/treasure_cove) -"WX" = ( -/mob/living/simple_animal/crab, -/area/ruin/unpowered) "Xp" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1595,25 +1588,25 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -kl -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC +Jz +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC Iv Iv Iv @@ -1641,25 +1634,25 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC Iv Iv "} @@ -1698,13 +1691,13 @@ UY UY UY jZ -hS -hS -hS -hS -kl -hS -hS +eC +eC +eC +eC +Jz +eC +eC Iv Iv "} @@ -1746,11 +1739,11 @@ TN UY UY jZ -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC Iv "} (6,1,1) = {" @@ -1792,11 +1785,11 @@ TN TN TN jZ -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC "} (7,1,1) = {" Iv @@ -1838,10 +1831,10 @@ TN TN TN jZ -hS -hS -hS -hS +eC +eC +eC +eC "} (8,1,1) = {" Iv @@ -1883,10 +1876,10 @@ TN TN TN bN -hS -hS -hS -hS +eC +eC +eC +eC "} (9,1,1) = {" Iv @@ -1928,10 +1921,10 @@ TJ bB TN bN -hS -hS -hS -hS +eC +eC +eC +eC "} (10,1,1) = {" Iv @@ -1974,9 +1967,9 @@ TN TN TN jZ -hS -hS -hS +eC +eC +eC "} (11,1,1) = {" Iv @@ -2019,9 +2012,9 @@ TN TN TN bN -hS -hS -hS +eC +eC +eC "} (12,1,1) = {" Iv @@ -2064,9 +2057,9 @@ TN TN tH bN -hS -hS -hS +eC +eC +eC "} (13,1,1) = {" Iv @@ -2109,9 +2102,9 @@ TN TN TN bN -hS -hS -hS +eC +eC +eC "} (14,1,1) = {" Iv @@ -2155,8 +2148,8 @@ TN TN TN jZ -hS -hS +eC +eC "} (15,1,1) = {" Iv @@ -2200,8 +2193,8 @@ EE TN TN bN -hS -hS +eC +eC "} (16,1,1) = {" Iv @@ -2245,8 +2238,8 @@ eC TJ TN bN -hS -hS +eC +eC "} (17,1,1) = {" Iv @@ -2290,8 +2283,8 @@ lt lt TN bN -hS -hS +eC +eC "} (18,1,1) = {" lt @@ -2335,8 +2328,8 @@ lt TN TN bN -hS -hS +eC +eC "} (19,1,1) = {" lt @@ -2380,8 +2373,8 @@ TN TN TN bN -hS -hS +eC +eC "} (20,1,1) = {" lt @@ -2425,8 +2418,8 @@ TN TN TN bN -hS -hS +eC +eC "} (21,1,1) = {" lt @@ -2470,8 +2463,8 @@ TN TN TN bN -hS -hS +eC +eC "} (22,1,1) = {" lt @@ -2515,8 +2508,8 @@ TN TN tH bN -hS -hS +eC +eC "} (23,1,1) = {" Iv @@ -2560,8 +2553,8 @@ lt TN TN bN -hS -hS +eC +eC "} (24,1,1) = {" Iv @@ -2605,8 +2598,8 @@ TN TN TN bN -hS -hS +eC +eC "} (25,1,1) = {" Iv @@ -2650,8 +2643,8 @@ TN TN TN CB -hS -hS +eC +eC "} (26,1,1) = {" Iv @@ -2694,9 +2687,9 @@ TN TN TN bN -hS -hS -hS +eC +eC +eC "} (27,1,1) = {" Iv @@ -2739,9 +2732,9 @@ TN TN TN bN -WX -hS -hS +zE +eC +eC "} (28,1,1) = {" Iv @@ -2784,8 +2777,8 @@ TN TN TN CB -hS -hS +eC +eC Iv "} (29,1,1) = {" @@ -2828,9 +2821,9 @@ TN TN TN CB -hS -hS -hS +eC +eC +eC Iv "} (30,1,1) = {" @@ -2872,10 +2865,10 @@ TN TN TN CB -hS -hS -hS -hS +eC +eC +eC +eC Iv "} (31,1,1) = {" @@ -2916,9 +2909,9 @@ TN TN EE CB -hS -hS -hS +eC +eC +eC Iv Iv Iv @@ -2959,10 +2952,10 @@ EE EE EE CB -hS -hS -hS -hS +eC +eC +eC +eC Iv Iv Iv @@ -2999,14 +2992,14 @@ EE EE EE CB -hS -hS -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC +eC +eC Iv Iv Iv @@ -3038,19 +3031,19 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC ay -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC Iv Iv Iv @@ -3081,17 +3074,17 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC +eC Iv Iv Iv From 066912f1837907aa8d972dbd4d8a6bfcfc860dfc Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:20:57 -0400 Subject: [PATCH 08/10] Update beach_crashed_engineer.dmm --- _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 4a207a8f1d34..1eb17bf0202d 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -1005,6 +1005,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "SE" = ( /obj/structure/barricade/wooden, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "SF" = ( /obj/structure/cable{ From 8239287ffeb9ea6c55bb7d64d94631b24fd1ffb8 Mon Sep 17 00:00:00 2001 From: Bjarl <94164348+Bjarl@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:00:11 -0400 Subject: [PATCH 09/10] Update wasteplanet.dm --- code/game/turfs/open/floor/plating/wasteplanet.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm index 6ca992f4ca56..f0ea0c74af83 100644 --- a/code/game/turfs/open/floor/plating/wasteplanet.dm +++ b/code/game/turfs/open/floor/plating/wasteplanet.dm @@ -33,15 +33,15 @@ light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plasteel/wasteplanet - baseturfs = /turf/open/floor/plating/wasteplanet + baseturfs = /turf/open/floor/plating/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - light_color = COLOR_WASTEPLANET_LIGHT + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plasteel/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return /turf/open/floor/plasteel/dark/wasteplanet - baseturfs = /turf/open/floor/plating/wasteplanet + baseturfs = /turf/open/floor/plating/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS light_color = COLOR_WASTEPLANET_LIGHT From e726afe9920c62ee94b537ac45fb29d9d2fd73eb Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Fri, 18 Oct 2024 03:38:42 -0500 Subject: [PATCH 10/10] Update code/game/objects/effects/glowshroom.dm Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> --- code/game/objects/effects/glowshroom.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index dd7c5dfb3913..dc9c7bcd6855 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -16,7 +16,8 @@ var/spreadIntoAdjacentChance = 60 var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom var/static/list/blacklisted_glowshroom_turfs = typecacheof(list( - /turf/open/lava,)) + /turf/open/lava + )) /obj/structure/glowshroom/glowcap name = "glowcap"