Skip to content

Commit

Permalink
Exoplanet turf adjustments (#20568)
Browse files Browse the repository at this point in the history
Adjusts the generic exoplanet dirt turf so it doesn't leave footprints,
it's used in maps such as odyssey ones and the footprints get hellish on
those.
Also gives many exoplanet turfs descriptions, as well as adjusts the
names of some of them.
  • Loading branch information
Greenjoe12345 authored Mar 10, 2025
1 parent d5d5505 commit 7a7999b
Show file tree
Hide file tree
Showing 16 changed files with 104 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/modules/overmap/exoplanets/decor/_turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,14 @@

/turf/simulated/floor/exoplanet/water/shallow
name = "shallow water"
desc = "Some water shallow enough to wade through."
icon = 'icons/misc/beach.dmi'
icon_state = "seashallow"
footstep_sound = /singleton/sound_category/water_footstep

/turf/simulated/floor/exoplanet/permafrost
name = "permafrost"
desc = "The ground here is frozen solid by the cold."
icon = 'icons/turf/flooring/snow.dmi'
icon_state = "permafrost"
footstep_sound = /singleton/sound_category/asteroid_footstep
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/asphalt.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/asphalt
name = "asphalt"
gender = PLURAL
desc = "Once-hot asphalt."
icon = 'icons/turf/flooring/urban_turfs.dmi'
icon_state = "asphalt0"
Expand Down
5 changes: 4 additions & 1 deletion code/modules/overmap/exoplanets/decor/turfs/barren.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/turf/simulated/floor/exoplanet/barren
name = "ground"
gender = PLURAL
desc = "A patch of dirt."
icon = 'icons/turf/flooring/asteroid.dmi'
icon_state = "asteroid"
does_footprint = TRUE

/turf/simulated/floor/exoplanet/barren/update_icon()
overlays.Cut()
Expand All @@ -23,6 +24,8 @@
update_icon(1)

/turf/simulated/floor/exoplanet/barren/raskara
desc = "Dark, dark regolith."
does_footprint = TRUE
color = "#373737"

/turf/simulated/floor/exoplanet/barren/raskara/update_icon()
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/concrete.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/concrete
name = "concrete"
gender = PLURAL
desc = "Stone-like artificial material."
icon = 'icons/turf/flooring/concrete.dmi'
icon_state = "concrete0"
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/crystal.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/crystal
name = "quartz"
gender = PLURAL
desc = "A tough, compacted mineral surface, polished to a mirror sheen."
icon = 'icons/turf/crystal.dmi'
icon_state = "crystal"
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/diona.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/diona
name = "biomass flooring"
gender = PLURAL
icon = 'icons/turf/flooring/diona.dmi'
icon_state = "diona0"
footstep_sound = /singleton/sound_category/grass_footstep
Expand Down
12 changes: 12 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/grass.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/turf/simulated/floor/exoplanet/grass
name = "grass"
gender = PLURAL
desc = "Some lush grass."
icon = 'icons/turf/jungle.dmi'
icon_state = "greygrass"
color = "#799c4b"
Expand All @@ -19,6 +21,7 @@
resources[ORE_DIAMOND] = 1

/turf/simulated/floor/exoplanet/grass/grove
desc = "Short grass is growing here."
icon_state = "grove_grass1"
color = null
has_edge_icon = FALSE
Expand All @@ -28,12 +31,16 @@
icon_state = "grove_grass[rand(1,2)]"

/turf/simulated/floor/exoplanet/grass/stalk
name = "stalky grass"
desc = "Odd-looking, stalky grass."
icon = 'icons/turf/flooring/grass.dmi'
icon_state = "grass_stalk"
color = null
has_edge_icon = null

/turf/simulated/floor/exoplanet/grass/marsh
name = "marshy ground"
desc = "Marshy ground, small mushrooms grow here and there."
icon = 'icons/turf/fungal_marsh.dmi'
icon_state = "marsh"
color = null
Expand All @@ -45,13 +52,18 @@
icon_state = "marsh[rand(1,8)]"

/turf/simulated/floor/exoplanet/grass/moghes
name = "alien grass"
desc = "Thick, alien grass grows here."
icon = 'icons/turf/flooring/exoplanet/moghes.dmi'
icon_state = "grass"
color = null

/turf/simulated/floor/exoplanet/grass/moghes/dirt
name = "dirt"
desc = "A patch of dirt."
icon_state = "dirt"
color = null

/turf/simulated/floor/exoplanet/grass/moghes/dirt/beach
desc = "The ground slopes down into some water."
icon_state = "beach"
2 changes: 2 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/ice.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/turf/simulated/floor/exoplanet/ice
name = "ice"
gender = PLURAL
desc = "Water, frozen solid. Careful not to slip."
icon = 'icons/turf/flooring/snow.dmi'
icon_state = "ice"
footprint_color = FALSE
Expand Down
6 changes: 6 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/konyang.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/turf/simulated/floor/exoplanet/konyang
name = "dense mossy grass"
gender = PLURAL
desc = "An alien moss covers the ground."
icon = 'icons/turf/flooring/exoplanet/konyang.dmi'
icon_state = "grass"
footstep_sound = /singleton/sound_category/grass_footstep
Expand Down Expand Up @@ -31,19 +33,22 @@

/turf/simulated/floor/exoplanet/konyang/wilting//manually mapped. To be surrounded by normal grass
name = "wilting mossy grass"
desc = "An alien moss covers the ground. This patch doesn't look so healthy..."
icon = 'icons/turf/flooring/exoplanet/konyang/moss_transition_1.dmi'
icon_state = "unsmooth"
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
canSmoothWith = list(/turf/simulated/floor/exoplanet/konyang/wilting, /turf/simulated/floor/exoplanet/konyang/pink)

/turf/simulated/floor/exoplanet/konyang/pink//manually mapped. To be surrounded by wilting grass
name = "blossoming mossy grass"
desc = "The moss here is blooming in a shade of pink."
icon = 'icons/turf/flooring/exoplanet/konyang/moss_transition_2.dmi'
icon_state = "unsmooth"
smoothing_flags = SMOOTH_TRUE

/turf/simulated/floor/exoplanet/dirt_konyang//a different path entirely so it will allow for edges to generate from grass
name = "compacted dirt"
desc = "A patch of dirt."
icon = 'icons/turf/flooring/exoplanet/konyang.dmi'
icon_state = "dirt"
layer = 1.99//to let the grass edges go over it, which otherwise doesnt happen due to positioning and byond layering
Expand All @@ -61,6 +66,7 @@

/turf/simulated/floor/exoplanet/dirt_konyang/sand//same as above
name = "fine coastal sand"
desc = "Some fine, white sand."
icon = 'icons/turf/flooring/exoplanet/konyang/konyang_beach.dmi'
icon_state = "sand"
footstep_sound = /singleton/sound_category/asteroid_footstep
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/linoleum.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/lino
name = "linoleum"
desc = "It's like the 2390's all over again."
icon = 'icons/turf/flooring/linoleum.dmi'
icon_state = "lino_preview"
initial_flooring = /singleton/flooring/linoleum
Expand Down
2 changes: 2 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/mineral.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/turf/simulated/floor/exoplanet/mineral
name = "sand"
gender = PLURAL
desc = "It's coarse and gets everywhere."
dirt_color = "#544c31"
footstep_sound = /singleton/sound_category/sand_footstep

/turf/simulated/floor/exoplanet/mineral/adhomai
name = "icy rock"
desc = "Some cold rock."
icon = 'icons/turf/flooring/ice_cavern.dmi'
icon_state = "icy_rock"
temperature = T0C - 5
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/sand.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/desert
name = "sand"
gender = PLURAL
desc = "It's coarse and gets everywhere."
icon = 'icons/turf/desert.dmi'
icon_state = "desert"
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/exoplanets/decor/turfs/sidewalk.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/exoplanet/sidewalk
name = "weathered tiling"
gender = PLURAL
desc = "Great for speeding on."
icon = 'icons/turf/flooring/urban_turfs.dmi'
icon_state = "sidewalk-tile"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/snow.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/turf/simulated/floor/exoplanet/snow
name = "snow"
gender = PLURAL
desc = "It crunches as you pass over it."
icon = 'icons/turf/smooth/snow40.dmi'
icon_state = "snow"
dirt_color = "#e3e7e8"
Expand Down Expand Up @@ -32,6 +34,8 @@

/turf/simulated/floor/exoplanet/permafrost
name = "permafrost"
gender = PLURAL
desc = "Icy, frozen ground."
icon = 'icons/turf/flooring/snow.dmi'
icon_state = "permafrost"
footstep_sound = /singleton/sound_category/asteroid_footstep
Expand Down
6 changes: 6 additions & 0 deletions code/modules/overmap/exoplanets/decor/turfs/water.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/turf/simulated/floor/exoplanet/water
name = "water"
gender = PLURAL
icon = 'icons/misc/beach.dmi'
icon_state = "seadeep"
desc = "It is wet."
footstep_sound = /singleton/sound_category/water_footstep
movement_cost = 4
has_resources = FALSE
Expand Down Expand Up @@ -109,6 +114,7 @@

/turf/simulated/floor/exoplanet/water/shallow
name = "shallow water"
desc = "Some water shallow enough to wade through."
icon = 'icons/misc/beach.dmi'
icon_state = "seashallow"
footstep_sound = /singleton/sound_category/water_footstep
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/greenjoe12345 - turfwork.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Greenjoe12345

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Makes it so the generic exoplanet dirt ground doesn't leave footprints."
- rscadd: "Gives exoplanet turfs descriptions so they don't just say they are the bare hull. Adjusts some names as well."

0 comments on commit 7a7999b

Please sign in to comment.