diff --git a/code/modules/maps/planet_types/barren.dm b/code/modules/maps/planet_types/barren.dm index 8495577d151..d4fd495f688 100644 --- a/code/modules/maps/planet_types/barren.dm +++ b/code/modules/maps/planet_types/barren.dm @@ -18,6 +18,9 @@ ..() atmosphere.remove_ratio(0.9) +/obj/effect/overmap/visitable/sector/exoplanet/barren/get_surface_color() + return "#6C6251" + /datum/random_map/noise/exoplanet/barren descriptor = "barren exoplanet" smoothing_iterations = 4 diff --git a/code/modules/maps/planet_types/jungle.dm b/code/modules/maps/planet_types/jungle.dm index 62ce7e7cb94..5fe52938e66 100644 --- a/code/modules/maps/planet_types/jungle.dm +++ b/code/modules/maps/planet_types/jungle.dm @@ -10,6 +10,9 @@ possible_themes = list(/datum/exoplanet_theme/mountains/breathable) ruin_tags_blacklist = RUIN_VOID +/obj/effect/overmap/visitable/sector/exoplanet/grass/grove/get_surface_color() + return "#5C7F34" + /area/exoplanet/grass/grove base_turf = /turf/simulated/floor/exoplanet/grass/grove diff --git a/code/modules/overmap/exoplanets/exoplanet_skybox.dm b/code/modules/overmap/exoplanets/exoplanet_skybox.dm index bf277f38b25..de097422fcb 100644 --- a/code/modules/overmap/exoplanets/exoplanet_skybox.dm +++ b/code/modules/overmap/exoplanets/exoplanet_skybox.dm @@ -2,7 +2,7 @@ return skybox_image /obj/effect/overmap/visitable/sector/exoplanet/proc/get_base_image() - var/image/base = image('icons/skybox/planet.dmi', "base") + var/image/base = image('icons/skybox/planet.dmi', "base[pick(1,2,3)]") base.color = get_surface_color() return base @@ -15,7 +15,7 @@ skybox_image.overlays += theme.get_planet_image_extra() if (water_color) //TODO: move water levels out of randommap into exoplanet - var/image/water = image('icons/skybox/planet.dmi', "water") + var/image/water = image('icons/skybox/planet.dmi', "water[pick(1,2,3)]") water.color = water_color water.appearance_flags = DEFAULT_APPEARANCE_FLAGS | PIXEL_SCALE water.SetTransform(rotation = rand(0, 360)) @@ -27,23 +27,15 @@ if (!atmo_color) atmo_color = COLOR_WHITE - var/image/clouds = image('icons/skybox/planet.dmi', "weak_clouds") - - if (water_color) - clouds.overlays += image('icons/skybox/planet.dmi', "clouds") - + var/image/clouds = image('icons/skybox/planet.dmi', "clouds[pick(1,2,3)]") clouds.color = atmo_color skybox_image.overlays += clouds - var/image/atmo = image('icons/skybox/planet.dmi', "atmoring") - skybox_image.underlays += atmo - var/image/shadow = image('icons/skybox/planet.dmi', "shadow") + var/image/shadow = image('icons/skybox/planet.dmi', "shadow[pick(1,2,3)]") shadow.blend_mode = BLEND_MULTIPLY skybox_image.overlays += shadow - var/image/light = image('icons/skybox/planet.dmi', "lightrim") - skybox_image.overlays += light if (prob(20)) var/image/rings = image('icons/skybox/planet_rings.dmi') diff --git a/html/changelogs/alberyk-planeticons.yml b/html/changelogs/alberyk-planeticons.yml new file mode 100644 index 00000000000..492780fd08e --- /dev/null +++ b/html/changelogs/alberyk-planeticons.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added new exoplanet icons." diff --git a/icons/skybox/planet.dmi b/icons/skybox/planet.dmi index 45497b6e5fb..0f9aa466711 100644 Binary files a/icons/skybox/planet.dmi and b/icons/skybox/planet.dmi differ diff --git a/icons/skybox/planet_rings.dmi b/icons/skybox/planet_rings.dmi index b1226052060..34fb48ad03d 100644 Binary files a/icons/skybox/planet_rings.dmi and b/icons/skybox/planet_rings.dmi differ