From af8d27159986c287b3c95752d3be006ed8d47840 Mon Sep 17 00:00:00 2001 From: Sun-Soaked <45698967+MemedHams@users.noreply.github.com> Date: Fri, 18 Aug 2023 02:35:10 -0400 Subject: [PATCH] Assorted rock behaviors (#2273) ## About The Pull Request The weird smoothing interaction between bauxite/schist/indestructible ice walls & other walls was hurting my brain, so I fixed it Caught some other rock wall related stuff when I was at it. Notably, Indestructible Rock Walls now have the new, smoothed sprites, mappers rejoice. ## Why It's Good For The Game Crumch.. I love mineral... ## Changelog :cl: fix: polishes out some weird smoothing interactions between some rock walls and metal walls tweak: indestructible rock walls now have the new, smoothed sprites tweak: beach rockwalls now have a whimsical name & description, matching our other rock walls. fix: removes the junk 'asteroid' subtype of mineral/random /:cl: --- .../RockRuins/rockplanet_budgetcuts.dmm | 8 ++++---- .../RockRuins/rockplanet_crash_cult.dmm | 2 +- _maps/RandomRuins/RockRuins/rockplanet_cult.dmm | 2 +- .../RockRuins/rockplanet_harmfactory.dmm | 2 +- .../RockRuins/rockplanet_miningexpedition.dmm | 2 +- .../RandomRuins/SpaceRuins/dangerous_research.dmm | 2 +- _maps/RandomRuins/SpaceRuins/lab4071.dmm | 4 ++-- _maps/RandomRuins/SpaceRuins/oretruck.dmm | 14 +++++++------- _maps/RandomRuins/SpaceRuins/power_puzzle.dmm | 4 ++-- _maps/RandomRuins/SpaceRuins/provinggrounds.dmm | 4 ++-- _maps/RandomRuins/SpaceRuins/singularity_lab.dmm | 6 +++--- .../WasteRuins/wasteplanet_abandoned_mechbay.dmm | 4 ++-- .../WasteRuins/wasteplanet_clowncrash.dmm | 2 +- code/datums/mapgen/planetary/RockGenerator.dm | 2 +- code/datums/mapgen/planetary/WasteGenerator.dm | 2 +- .../datums/mapgen/single_biome/WasteplanetCaves.dm | 2 +- code/game/turfs/closed/_closed.dm | 13 ++++++++++--- code/game/turfs/closed/minerals.dm | 10 ++++++---- 18 files changed, 47 insertions(+), 38 deletions(-) diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index 980b4b3e6da9..9cf2b5a40bae 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -1550,7 +1550,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/powered) "zo" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "zp" = ( /obj/effect/decal/cleanable/ash{ @@ -2069,7 +2069,7 @@ /area/overmap_encounter/planetoid/rockplanet/explored) "HL" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "Ia" = ( /obj/effect/decal/cleanable/garbage{ @@ -2139,7 +2139,7 @@ pixel_x = -6; pixel_y = -9 }, -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "Jm" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -2591,7 +2591,7 @@ /turf/open/floor/plasteel, /area/ruin/powered) "Ta" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/ruin/powered) "Tj" = ( /obj/structure/table, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm b/_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm index ad780a525321..d36bbab74454 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm @@ -1387,7 +1387,7 @@ /turf/open/floor/plasteel/cult, /area/ruin/unpowered) "XI" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "XN" = ( /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm b/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm index 347fe39c47ab..c1ed6773992d 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm @@ -70,7 +70,7 @@ /turf/open/floor/plasteel/dark, /area/overmap_encounter/planetoid/rockplanet/explored) "u" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "v" = ( /obj/structure/trap/cult, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm index 73cb5bbb6fb7..5ba299eb454c 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm @@ -7,7 +7,7 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "aB" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/cave/explored) "aG" = ( /turf/open/floor/plating/asteroid/rockplanet/cracked, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm index 57a8422ba3b0..7586ab699883 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm @@ -152,7 +152,7 @@ /turf/open/floor/plasteel/rockvault, /area/ruin/unpowered) "yZ" = ( -/turf/closed/mineral/random/asteroid/rockplanet, +/turf/closed/mineral/random/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) "BR" = ( /obj/effect/decal/cleanable/oil, diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index 07f23cae71c8..73c7dd734c00 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -963,7 +963,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav) "Bg" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/template_noop) "Bz" = ( /obj/effect/decal/cleanable/blood/tracks{ diff --git a/_maps/RandomRuins/SpaceRuins/lab4071.dmm b/_maps/RandomRuins/SpaceRuins/lab4071.dmm index 5546b4a940da..2f4c94d3c939 100644 --- a/_maps/RandomRuins/SpaceRuins/lab4071.dmm +++ b/_maps/RandomRuins/SpaceRuins/lab4071.dmm @@ -8,7 +8,7 @@ /turf/open/space, /area/ruin/space/has_grav/crazylab/outside) "at" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/crazylab/outside) "au" = ( /obj/effect/decal/cleanable/dirt, @@ -3409,7 +3409,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/space/has_grav/crazylab/bomb) "TM" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/crazylab/bomb) "TW" = ( /obj/structure/sign/poster/contraband/rip_badger, diff --git a/_maps/RandomRuins/SpaceRuins/oretruck.dmm b/_maps/RandomRuins/SpaceRuins/oretruck.dmm index 8d466f7b9f8e..33ad6be2b4fe 100644 --- a/_maps/RandomRuins/SpaceRuins/oretruck.dmm +++ b/_maps/RandomRuins/SpaceRuins/oretruck.dmm @@ -16,7 +16,7 @@ /obj/structure/sign/warning/radiation{ pixel_y = 32 }, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/template_noop) "ao" = ( /obj/effect/turf_decal/industrial/warning/corner, @@ -253,7 +253,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/radship/Hallway) "fG" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/radship/Cargo1) "fN" = ( /obj/structure/cable{ @@ -564,7 +564,7 @@ /area/ruin/space/has_grav/radship/EngineRoom) "nk" = ( /obj/effect/turf_decal/industrial/warning/fulltile, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/radship/Cargo1) "nt" = ( /turf/closed/wall/mineral/plastitanium, @@ -1385,7 +1385,7 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/radship/Cargo1) "KK" = ( /obj/effect/turf_decal/industrial/warning/fulltile, @@ -1484,7 +1484,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/space/has_grav/radship/Cargo3) "NR" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/template_noop) "NS" = ( /obj/structure/closet/crate/large, @@ -1929,11 +1929,11 @@ /obj/structure/sign/warning/securearea{ pixel_y = 32 }, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/template_noop) "YV" = ( /obj/item/trash/boritos, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/template_noop) "Zb" = ( /obj/effect/turf_decal/industrial/warning/corner{ diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm index 8f100d4ac0b2..6972f466bb5b 100644 --- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm +++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm @@ -21,7 +21,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle) "ah" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav) "ai" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -1158,7 +1158,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle) "hp" = ( -/turf/closed/mineral/random/asteroid{ +/turf/closed/mineral/random{ light_range = 2 }, /area/ruin/space/has_grav) diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index 737669621f89..04d54f5eeee4 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -994,7 +994,7 @@ /area/ruin/space/has_grav/syndicircle/halls) "Bc" = ( /obj/machinery/light/directional/west, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/syndicircle/spacewalk) "Bj" = ( /obj/structure/cable{ @@ -1556,7 +1556,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) "OH" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav/syndicircle/spacewalk) "OW" = ( /turf/closed/wall/mineral/titanium, diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 05c9e5aca1c8..8d0005b5eaf6 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -1538,7 +1538,7 @@ /area/ruin/space/has_grav/singularitylab) "fU" = ( /obj/structure/table, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav) "fW" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -9186,7 +9186,7 @@ /obj/machinery/door/airlock{ name = "Private Quarters" }, -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav) "Ij" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -11404,7 +11404,7 @@ /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/singularitylab) "QB" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random, /area/ruin/space/has_grav) "QC" = ( /obj/structure/cable{ diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm index 38a8c33d56ac..d91f8f24b4b6 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm @@ -1197,7 +1197,7 @@ /turf/open/floor/concrete/slab_4, /area/ruin/wasteplanet/abandoned_mechbay/mainhall) "ms" = ( -/turf/closed/mineral/random/asteroid/wasteplanet, +/turf/closed/mineral/random/wasteplanet, /area/ruin/wasteplanet/abandoned_mechbay) "mx" = ( /obj/machinery/camera/autoname{ @@ -2590,7 +2590,7 @@ /turf/closed/wall/concrete, /area/ruin/wasteplanet/abandoned_mechbay/mechlab) "DV" = ( -/turf/closed/mineral/random/asteroid/wasteplanet, +/turf/closed/mineral/random/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "DY" = ( /obj/machinery/door/airlock/engineering{ diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm index b4492dbaef4c..ae2434a3ca45 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm @@ -69,7 +69,7 @@ /turf/open/floor/plating/asteroid/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "k" = ( -/turf/closed/mineral/random/asteroid/wasteplanet, +/turf/closed/mineral/random/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "l" = ( /obj/item/grown/bananapeel, diff --git a/code/datums/mapgen/planetary/RockGenerator.dm b/code/datums/mapgen/planetary/RockGenerator.dm index 5496984db43a..83e3919ef154 100644 --- a/code/datums/mapgen/planetary/RockGenerator.dm +++ b/code/datums/mapgen/planetary/RockGenerator.dm @@ -136,7 +136,7 @@ ) /datum/biome/cave/rock - closed_turf_types = list(/turf/closed/mineral/random/asteroid/rockplanet = 1) + closed_turf_types = list(/turf/closed/mineral/random/rockplanet = 1) open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/cracked = 1) flora_spawn_chance = 4 flora_spawn_list = list( diff --git a/code/datums/mapgen/planetary/WasteGenerator.dm b/code/datums/mapgen/planetary/WasteGenerator.dm index a660e3d35321..d3e81ad44615 100644 --- a/code/datums/mapgen/planetary/WasteGenerator.dm +++ b/code/datums/mapgen/planetary/WasteGenerator.dm @@ -279,7 +279,7 @@ ) closed_turf_types = list( - /turf/closed/mineral/random/asteroid/wasteplanet = 40, + /turf/closed/mineral/random/wasteplanet = 40, /turf/closed/wall/r_wall = 1, /turf/closed/wall/r_wall/rust = 3, /turf/closed/wall = 2, diff --git a/code/datums/mapgen/single_biome/WasteplanetCaves.dm b/code/datums/mapgen/single_biome/WasteplanetCaves.dm index b067947bfec7..472a5cf4d54b 100644 --- a/code/datums/mapgen/single_biome/WasteplanetCaves.dm +++ b/code/datums/mapgen/single_biome/WasteplanetCaves.dm @@ -11,7 +11,7 @@ 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/asteroid/wasteplanet = 45, + closed_turf_types = list(/turf/closed/mineral/random/wasteplanet = 45, /turf/closed/wall/rust = 10,) flora_spawn_list = list( diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index b64f9585d495..597166b83ca3 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -235,8 +235,14 @@ /turf/closed/indestructible/rock name = "dense rock" desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this." - icon = 'icons/turf/mining.dmi' - icon_state = "rock" + icon = 'icons/turf/walls/rock_wall.dmi' + icon_state = "rock_wall-0" + base_icon_state = "rock_wall" + smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER + smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) + pixel_x = -4 + pixel_y = -4 /turf/closed/indestructible/rock/snow name = "mountainside" @@ -257,7 +263,8 @@ icon_state = "icerock_wall-0" base_icon_state = "icerock_wall" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER - canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS) + smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) pixel_x = -4 pixel_y = -4 diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index eaba5a92ada4..1f2d9c94384d 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -246,7 +246,7 @@ icon_state = "rockwall_icemoon-0" base_icon_state = "rockwall_icemoon" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER - canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS) + canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) environment_type = "snow_cavern" turf_type = /turf/open/floor/plating/asteroid/icerock baseturfs = /turf/open/floor/plating/asteroid/icerock @@ -770,7 +770,7 @@ icon_state = "jungle_wall-0" base_icon_state = "jungle_wall" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER - canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS) + canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) turf_type = /turf/open/floor/plating/dirt/jungle baseturfs = /turf/open/floor/plating/dirt/jungle mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 8, /obj/item/stack/ore/diamond = 8, /obj/item/stack/ore/gold = 10, @@ -778,10 +778,12 @@ /obj/item/stack/ore/bluespace_crystal = 5) /turf/closed/mineral/random/beach + name = "coastal marl" + desc = "Water eats away at the shoreline, forming rippling scars in softening stone." baseturfs = /turf/open/floor/plating/asteroid/sand/dense initial_gas_mix = OPENTURF_DEFAULT_ATMOS -/turf/closed/mineral/random/asteroid/rockplanet +/turf/closed/mineral/random/rockplanet name = "hematite" desc = "Iron grit rusts softly, bringing forth a crimson hue." icon = 'icons/turf/mining.dmi' @@ -802,7 +804,7 @@ smooth_icon = 'icons/turf/walls/red_wall.dmi' base_icon_state = "red_wall" -/turf/closed/mineral/random/asteroid/wasteplanet +/turf/closed/mineral/random/wasteplanet name = "polluted rock" desc = "Whatever once held sway, the poison is all that remains." icon = 'icons/turf/walls/wasteplanet.dmi'