From a1b25de5669c05b442185d996de36f866031ef4f Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 13 Feb 2023 08:12:25 -0300 Subject: [PATCH] Makes some overmap items less generic (#15790) --- code/modules/maps/planet_types/barren.dm | 7 +++--- .../maps/planet_types/lore/srandmarr.dm | 22 ++++++++++++++++++- code/modules/overmap/exoplanets/exoplanet.dm | 5 ++++- html/changelogs/alberyk-overmapcolors.yml | 7 ++++++ .../tajara/mining_jack/mining_jack.dm | 12 +++++++--- .../tajara/peoples_station/peoples_station.dm | 7 +++++- .../saniorios_smuggler/saniorios_smuggler.dm | 2 +- .../away_site/tajara/scrapper/scrapper.dm | 8 ++++--- .../tajara/taj_safehouse/tajara_safehouse.dm | 10 +++++++-- .../unathi_pirate/unathi_pirate_izharshan.dm | 5 +++-- .../ships/dpra/hailstorm/hailstorm_ship.dm | 4 ++-- .../database_freighter/database_freighter.dm | 4 ++-- .../ships/pra/headmaster/headmaster_ship.dm | 4 ++-- 13 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 html/changelogs/alberyk-overmapcolors.yml diff --git a/code/modules/maps/planet_types/barren.dm b/code/modules/maps/planet_types/barren.dm index a355f4fcbca..13a94cf4f67 100644 --- a/code/modules/maps/planet_types/barren.dm +++ b/code/modules/maps/planet_types/barren.dm @@ -59,10 +59,6 @@ if(prob(20)) overlays += image('icons/turf/decals/decals.dmi', "asteroid[rand(0,9)]") -/obj/effect/overmap/visitable/sector/exoplanet/barren/Initialize() - . = ..() - icon_state = "asteroid[rand(1,3)]" - /turf/simulated/floor/exoplanet/barren/Initialize() . = ..() update_icon() @@ -99,6 +95,9 @@ /datum/map_template/ruin/exoplanet/drill_site) place_near_main = list(1, 1) +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/update_icon() + icon_state = "asteroid[rand(1,3)]" + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/generate_planet_image() skybox_image = image('icons/skybox/skybox_rock_128.dmi', "bigrock") skybox_image.color = pick(rock_colors) diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index 6ce337ae7fb..228397e8996 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -3,6 +3,7 @@ name = "Ae'themir" desc = "A planet comprised mainly of solid common minerals and silicate." color = "#B1A69B" + icon_state = "globe1" rock_colors = list(COLOR_GRAY80) possible_themes = list(/datum/exoplanet_theme/mountains) map_generators = list(/datum/random_map/noise/exoplanet/barren, /datum/random_map/noise/ore) @@ -21,11 +22,15 @@ /obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir/get_surface_color() return "#B1A69B" +/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir/update_icon() + return + //Az'Mar /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar name = "Az'Mar" desc = "A small planet with a caustic shale crust. The surface is extremely hot and dense." color = "#4a3f41" + icon_state = "globe2" rock_colors = null plant_colors = null rock_colors = list("#4a3f41") @@ -50,17 +55,25 @@ atmosphere.temperature = T0C + 500 atmosphere.update_values() +/obj/effect/overmap/visitable/sector/exoplanet/barren/azmar/update_icon() + return + //Sahul /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul name = "Sahul" desc = "Az'mar's moon is a celestial body composed primarily of molten metals." + icon_state = "globe1" generated_name = FALSE ring_chance = 0 +/obj/effect/overmap/visitable/sector/exoplanet/lava/sahul/update_icon() + return + //Raskara /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara name = "Raskara" desc = "A barren moon orbiting Adhomai." + icon_state = "globe1" color = "#373737" rock_colors = list("#373737") planetary_area = /area/exoplanet/barren/raskara @@ -76,6 +89,9 @@ /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara/get_surface_color() return "#373737" +/obj/effect/overmap/visitable/sector/exoplanet/barren/raskara/update_icon() + return + /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara/generate_planet_image() skybox_image = image('icons/skybox/lore_planets.dmi', "raskara") skybox_image.pixel_x = rand(0,64) @@ -102,7 +118,8 @@ /obj/effect/overmap/visitable/sector/exoplanet/adhomai name = "Adhomai" desc = "The Tajaran homeworld. Adhomai is a cold and icy world, suffering from almost perpetual snowfall and extremely low temperatures." - color = "#dcdcdc" + icon_state = "globe2" + color = "#b5dfeb" planetary_area = /area/exoplanet/adhomai rock_colors = null plant_colors = null @@ -164,6 +181,9 @@ atmosphere.temperature = T0C - 5 atmosphere.update_values() +/obj/effect/overmap/visitable/sector/exoplanet/adhomai/update_icon() + return + /datum/random_map/noise/exoplanet/snow/adhomai descriptor = "Adhomai" smoothing_iterations = 1 diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index e8672cc2f69..f76b5afde98 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -63,7 +63,10 @@ /obj/effect/overmap/visitable/sector/exoplanet/Initialize() . = ..() - icon_state = "globe[rand(1,3)]" + update_icon() + +/obj/effect/overmap/visitable/sector/exoplanet/update_icon() + icon_state = "globe[rand(1,3)]" /obj/effect/overmap/visitable/sector/exoplanet/New(nloc, max_x, max_y) if(!current_map.use_overmap) diff --git a/html/changelogs/alberyk-overmapcolors.yml b/html/changelogs/alberyk-overmapcolors.yml new file mode 100644 index 00000000000..3536ea7dcca --- /dev/null +++ b/html/changelogs/alberyk-overmapcolors.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Some away sites have different sprites and colors." + - tweak: "S'rand'marr overmap planet objects now have lore accurate icons." diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dm b/maps/away/away_site/tajara/mining_jack/mining_jack.dm index 8d2bb443e0b..ef206f2e3fc 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dm @@ -15,6 +15,11 @@ /obj/effect/overmap/visitable/sector/tajara_mining_jack name = "adhomian mining outpost" desc = "An outpost used by the crew of adhomian mining jacks." + + icon = 'icons/obj/overmap/overmap_stationary.dmi' + icon_state = "outpost" + color = "#DAA06D" + initial_generic_waypoints = list( "nav_tajara_mining_jack_1", "nav_tajara_mining_jack_2", @@ -24,7 +29,7 @@ "Mining Jack" = list("nav_hangar_tajara_mining_jack") ) comms_support = TRUE - comms_name = "adhomian" + comms_name = "adhomian mining" /obj/effect/shuttle_landmark/tajara_mining_jack base_turf = /turf/space @@ -49,8 +54,9 @@ class = "ACV" desc = "A modified skipjack used by Tajaran miners. These models have been modified to mine as much as possible with a small crew. Due to its limited fuel supply, it usually does not go too far from its home base." shuttle = "Mining Jack" - icon_state = "shuttle_grey" - moving_state = "shuttle_grey_moving" + icon_state = "shuttle" + moving_state = "shuttle_moving" + colors = list("#DAA06D") max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm index fe6c6d7ecb3..94984822483 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm @@ -15,6 +15,11 @@ /obj/effect/overmap/visitable/sector/peoples_station name = "People's Space Station" desc = "Built in the interwar period, the People's Space Station bears the prestige of being the first space installation designed, constructed, and manned by Tajara." + + icon = 'icons/obj/overmap/overmap_stationary.dmi' + icon_state = "battlestation" + color = "#8A3324" + initial_generic_waypoints = list( "nav_peoples_station_ship_1", "nav_peoples_station_ship_1", @@ -52,7 +57,7 @@ desc = "An interceptor used by the Orbital Fleet in its carriers and stations." shuttle = "Orbital Fleet Fang" icon_state = "shuttle" - moving_state = "shuttle_red_moving" + moving_state = "shuttle_moving" max_speed = 1/(1 SECONDS) burn_delay = 1 SECONDS vessel_mass = 3000 diff --git a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm index 91c1c340a38..0a9fec099c1 100644 --- a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm +++ b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm @@ -14,7 +14,7 @@ /obj/effect/overmap/visitable/sector/saniorios_smuggler name = "Sani'Orios" desc = "A gas giant composed of ammonia. Its planetary ring is home to several spaceship wrecks and hidden smuggler bases." - icon_state = "globe" + icon_state = "globe3" color = COLOR_DARK_BLUE_GRAY /obj/effect/overmap/visitable/sector/saniorios_smuggler/get_skybox_representation() diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dm b/maps/away/away_site/tajara/scrapper/scrapper.dm index b75194c3911..2c0694c03f9 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dm @@ -24,7 +24,8 @@ "Scrapper Ship" = list("nav_hangar_tajara_scrapper") ) comms_support = TRUE - comms_name = "adhomian" + comms_name = "adhomian scrapper" + color = "#DAA06D" /obj/effect/shuttle_landmark/tajara_scrapper base_turf = /turf/space @@ -49,8 +50,9 @@ class = "ACV" desc = "A horseshoe-shaped ship used by Adhomian Scrappers. Frequently used in repairs and scrapping operations." shuttle = "Scrapper Ship" - icon_state = "shuttle_grey" - moving_state = "shuttle_grey_moving" + icon_state = "skipjack" + moving_state = "skipjack_moving" + colors = list("#DAA06D") max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm index 4246c1cb8f4..e81f65b2d7d 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm @@ -15,6 +15,11 @@ /obj/effect/overmap/visitable/sector/tajara_safehouse name = "abandoned outpost" desc = "A derelict space outpost." + + icon = 'icons/obj/overmap/overmap_stationary.dmi' + icon_state = "outpost" + color = "#CD4A4C" + initial_restricted_waypoints = list( "Unmarked Civilian Shuttle" = list("nav_hangar_tajara_safehouse") ) @@ -43,8 +48,9 @@ designation = "Civilian Shuttle" desc = "A civilian shuttle without any kind of identification." shuttle = "Unmarked Civilian Shuttle" - icon_state = "shuttle_grey" - moving_state = "shuttle_grey_moving" + icon_state = "shuttle" + moving_state = "shuttle_moving" + colors = list("#CD4A4C") max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod diff --git a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm index 6d38b08fe08..6321d036308 100644 --- a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm +++ b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm @@ -76,8 +76,9 @@ shuttle = "Izharshan Freighter" designation = "Anvil" desc = "Though the sensors identify the engine signature and overall rough profile of the signal as being from an older Hegemonic Brick-class civilian freight shuttle, many modifications are detected, such as possible anti-ship weaponry onboard." - icon_state = "shuttle_green" - moving_state = "shuttle_green_moving" + icon_state = "generic" + moving_state = "generic_moving" + colors = list("#95de9c") max_speed = 1/(2 SECONDS) burn_delay = 2 SECONDS vessel_mass = 7500 //This truck is too damn big diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm index b5dc082e5c0..203e569c71b 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm @@ -18,7 +18,7 @@ class = "DPRAMV" //Democratic People's Republic of Adhomai Vessel icon_state = "hailstorm" moving_state = "hailstorm_moving" - colors = list("#f0d295", "#ecb037") + colors = list("B9BDC4") vessel_mass = 10000 max_speed = 1/(2 SECONDS) fore_dir = NORTH @@ -64,7 +64,7 @@ desc = "A simple and reliable shuttle design used by the Spacer Militia Shuttle." icon_state = "shuttle" moving_state = "shuttle_moving" - colors = list("#f0d295", "#ecb037") + colors = list("B9BDC4") class = "DPRAMV" designation = "Yve'kha" shuttle = "Spacer Militia Shuttle" diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm index 7f7ca544605..ebf4cb03314 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dm @@ -18,7 +18,7 @@ class = "PRAMV" //People's Republic of Adhomai Vessel icon_state = "tramp" moving_state = "tramp_moving" - colors = list("#fad89f", "#f1d378") + colors = list("#8A3324") vessel_mass = 10000 max_speed = 1/(2 SECONDS) fore_dir = NORTH @@ -68,7 +68,7 @@ desc = "A simple and reliable shuttle design used by the Orbital Fleet." icon_state = "shuttle" moving_state = "shuttle_moving" - colors = list("#fad89f", "#f1d378") + colors = list("#8A3324") class = "PRAMV" designation = "Yve'kha" shuttle = "Database Freighter Shuttle" diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dm b/maps/away/ships/pra/headmaster/headmaster_ship.dm index 4ef17b7cd47..683202df851 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dm @@ -18,7 +18,7 @@ class = "PRAMV" //People's Republic of Adhomai Vessel icon_state = "headmaster" moving_state = "headmaster_moving" - colors = list("#fad89f", "#f1d378") + colors = list("#8A3324") vessel_mass = 10000 max_speed = 1/(2 SECONDS) fore_dir = NORTH @@ -68,7 +68,7 @@ desc = "A simple and reliable shuttle design used by the Orbital Fleet." icon_state = "shuttle" moving_state = "shuttle_moving" - colors = list("#fad89f", "#f1d378") + colors = list("#8A3324") class = "PRAMV" designation = "Yve'kha" shuttle = "Orbital Fleet Shuttle"