Skip to content

Commit

Permalink
Assorted rock behaviors (#2273)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Crumch.. I love mineral...

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sun-Soaked authored Aug 18, 2023
1 parent fd13d89 commit af8d271
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 38 deletions.
8 changes: 4 additions & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_cult.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/dangerous_research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/lab4071.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions _maps/RandomRuins/SpaceRuins/oretruck.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/provinggrounds.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mapgen/planetary/RockGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mapgen/planetary/WasteGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mapgen/single_biome/WasteplanetCaves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 10 additions & 3 deletions code/game/turfs/closed/_closed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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

Expand Down
10 changes: 6 additions & 4 deletions code/game/turfs/closed/minerals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -770,18 +770,20 @@
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,
/obj/item/stack/ore/silver = 4, /obj/item/stack/ore/plasma = 25, /obj/item/stack/ore/iron = 25, /obj/item/stack/ore/titanium = 10,
/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'
Expand All @@ -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'
Expand Down

0 comments on commit af8d271

Please sign in to comment.