diff --git a/code/modules/maps/planet_types/lore/konyang.dm b/code/modules/maps/planet_types/lore/konyang.dm index e0a5c81f2af..c4f17a7a799 100644 --- a/code/modules/maps/planet_types/lore/konyang.dm +++ b/code/modules/maps/planet_types/lore/konyang.dm @@ -18,11 +18,16 @@ plant_colors = null//pre colored generated_name = FALSE ruin_planet_type = PLANET_LORE - ruin_type_whitelist = null - possible_themes = null + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/konyang_landing_zone) + possible_themes = list(/datum/exoplanet_theme/konyang) place_near_main = list(1,0) - var/landing_theme - var/landing_details + +/obj/effect/overmap/visitable/sector/exoplanet/konyang/Initialize() + . = ..() + var/area/overmap/map = global.map_overmap + for(var/obj/effect/overmap/visitable/sector/point_verdant/P in map) + P.x = x + P.y = y /obj/effect/overmap/visitable/sector/exoplanet/konyang/generate_habitability() return HABITABILITY_IDEAL @@ -47,33 +52,3 @@ atmosphere.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD, 1) atmosphere.temperature = T20C atmosphere.update_values() - -/obj/effect/overmap/visitable/sector/exoplanet/konyang/pre_ruin_preparation() - landing_theme = pick("settled jungles", "uncharted jungles", "subterranean cavities", "open sea", "abandoned infrastructure") - switch(landing_theme) - if("settled jungles") - possible_themes = list(/datum/exoplanet_theme/konyang) - ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/konyang_landing_zone) - landing_details = " Charts indicate potential native habitats in proximity. Permissable landing zones include a Conglomerate-operated shuttle outpost." - - if("uncharted jungles") - possible_themes = list(/datum/exoplanet_theme/konyang/uncharted) - ruin_type_whitelist = list (null) - landing_details = " No existing infrastructure is in place to support landing. Permissable landing zone is expected to be a natural clearing." - - if("subterranean cavities") - possible_themes = list(/datum/exoplanet_theme/konyang/underground) - ruin_type_whitelist = list (null) - landing_details = " Existing Conglomerate-operated infrastructure allows for unassisted landing. Permissable landing zone is within subterranean Conglomerate-operated shuttle pad." - - if("open sea") - possible_themes = list(/datum/exoplanet_theme/konyang/ocean) - ruin_type_whitelist = list (null) - landing_details = " Existing Conglomerate-operated infrastructure allows for unassisted landing. Permissable landing zone is expected to be a surface-bouyant naval shuttle pad." - - if("abandoned infrastructure") - possible_themes = list(/datum/exoplanet_theme/konyang/abandoned) - ruin_type_whitelist = list (null) - landing_details = " Existing derelict infrastructure allows for unassisted landing. Permissable landing zone is expected to be a paved untagged pad." - - desc += " Designated landing zones provide generic survey descriptor of [landing_theme]. [landing_details]" diff --git a/code/modules/overmap/exoplanets/themes/jungle.dm b/code/modules/overmap/exoplanets/themes/jungle.dm index 203dffb1fca..fa2efacca7c 100644 --- a/code/modules/overmap/exoplanets/themes/jungle.dm +++ b/code/modules/overmap/exoplanets/themes/jungle.dm @@ -40,7 +40,7 @@ surface_turfs = list( /turf/simulated/mineral ) - mountain_threshold = 0.8 + mountain_threshold = 0.6 possible_biomes = list( BIOME_COOL = list( BIOME_ARID = /singleton/biome/konyang/water, diff --git a/html/changelogs/RustingWithYou - konyangstuff.yml b/html/changelogs/RustingWithYou - konyangstuff.yml new file mode 100644 index 00000000000..01d14a5c594 --- /dev/null +++ b/html/changelogs/RustingWithYou - konyangstuff.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Point Verdant will now spawn on the same tile as Konyang." diff --git a/icons/obj/overmap/overmap_effects.dmi b/icons/obj/overmap/overmap_effects.dmi index 6793b05e282..9992db179b6 100644 Binary files a/icons/obj/overmap/overmap_effects.dmi and b/icons/obj/overmap/overmap_effects.dmi differ diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dm b/maps/away/away_site/konyang/point_verdant/point_verdant.dm index 95db56fca4b..9f2df527e00 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dm @@ -14,7 +14,7 @@ /obj/effect/overmap/visitable/sector/point_verdant name = "Konyang - Point Verdant Spaceport" desc = "A landing zone designated by local authorities within an SCC-affiliated spaceport. Accommodations have been made to ensure full visitation of any open facilities present." - icon_state = "object" + icon_state = "poi" scanimage = "konyang_point_verdant.png" place_near_main = list(0,0) landing_site = TRUE