diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index c118e000a28..8897946967f 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -76,7 +76,7 @@ if(!config.starlight) return if(locate(/turf/simulated) in RANGE_TURFS(1, src)) - set_light(1, config.starlight, l_color = SSskybox.background_color) + set_light(SSatlas.current_sector.starlight_range, SSatlas.current_sector.starlight_power, l_color = SSskybox.background_color) else set_light(0) diff --git a/code/modules/background/space_sectors/badlands.dm b/code/modules/background/space_sectors/badlands.dm index e3e2c3ef2c3..804aee6d221 100644 --- a/code/modules/background/space_sectors/badlands.dm +++ b/code/modules/background/space_sectors/badlands.dm @@ -5,7 +5,9 @@ but natives aren't known to treat settlements kindly." skybox_icon = "badlands" possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava) - starlight_color = COLOR_PALE_RED_GRAY + starlight_color = "#b13636" + starlight_power = 2 + starlight_range = 4 /datum/space_sector/valley_hale name = SECTOR_VALLEY_HALE @@ -14,7 +16,9 @@ safer parts of the known Frontier. After 2462, the Republic of Elyra has occupied the majority of Valley Hale, now bordering the Republic of Biesel." skybox_icon = "valley_hale" possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava) - starlight_color = "#fde497" + starlight_color = "#e68831" + starlight_power = 2 + starlight_range = 4 /datum/space_sector/new_ankara name = SECTOR_NEW_ANKARA @@ -23,7 +27,9 @@ before and after independence. Commercial and service sector jobs remain the highest employer, second to refineries processing phoron or other minerals transported to the planet's \ orbit. This is among the primary locations in Elyra where phoron can be found in abundance." skybox_icon = "valley_hale" - starlight_color = "#fde497" + starlight_color = "#e68831" + starlight_power = 2 + starlight_range = 4 /datum/space_sector/aemag name = SECTOR_AEMAQ @@ -33,7 +39,9 @@ planet well-known for its research into the seas the chemical industry remains the primary employer on Aemaq, and many hopeful immigrants to the Republic find themselves working \ in the massive chemical plants of Aemaq to make ends meet." skybox_icon = "valley_hale" - starlight_color = "#fde497" + starlight_color = "#e68831" + starlight_power = 2 + starlight_range = 4 /datum/space_sector/srandmarr name = SECTOR_SRANDMARR @@ -43,7 +51,9 @@ skybox_icon = "srandmarr" possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul, /obj/effect/overmap/visitable/sector/exoplanet/adhomai) cargo_price_coef = list("nt" = 1.2, "hpi" = 1.2, "zhu" = 1.2, "een" = 1.2, "get" = 1.2, "arz" = 1.2, "blm" = 1.2, "iac" = 1.2, "zsc" = 0.5, "vfc" = 1.2, "bis" = 1.2, "xmg" = 1.2, "npi" = 1.2) - starlight_color = "#B9E8EA" + starlight_color = "#50b7bb" + starlight_power = 2 + starlight_range = 4 sector_lobby_art = list('icons/misc/titlescreens/lore/cold_dawn.dmi') sector_lobby_transitions = 0 sector_welcome_message = 'sound/AI/adhomai_welcome.ogg' @@ -58,6 +68,8 @@ Tajara can survive in these regions without the use of suits. The use of acclimatization systems is necessary during the \ warmer seasons." starlight_color = COLOR_WHITE + starlight_power = 5 + starlight_range = 1 /datum/space_sector/gakal name = SECTOR_GAKAL @@ -65,10 +77,14 @@ The majority of the surface is covered by hills, steppes, and forests. Temperatures are generally low, but the average climate is considered to be more moderate and warm than \ Adhomai. Gakal'zaal is home to a large Tajara population, with an Unathi minority living at the equator." starlight_color = COLOR_WHITE + starlight_power = 5 + starlight_range = 1 /datum/space_sector/uueoaesa name = SECTOR_UUEOAESA description = "The home of the Unathi race, Uueoa-Esa is a solar system with 4 rocky planets and 1 gas giant. Moghes is the homeworld of the Unathi species and third from its mother star. \ It is similar in density and composition to Earth and held host to varied and complex environments and local fauna and flora. It's surface area of salt water is much lower than most other habitable planets. \ Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430's." - starlight_color = COLOR_WHITE \ No newline at end of file + starlight_color = COLOR_WHITE + starlight_power = 5 + starlight_range = 1 \ No newline at end of file diff --git a/code/modules/background/space_sectors/space_sector.dm b/code/modules/background/space_sectors/space_sector.dm index e0224aa09bb..a820758ab14 100644 --- a/code/modules/background/space_sectors/space_sector.dm +++ b/code/modules/background/space_sectors/space_sector.dm @@ -2,6 +2,8 @@ var/name var/description var/starlight_color = COLOR_WHITE + var/starlight_power = 1 + var/starlight_range = 1 var/list/possible_erts = list() var/list/possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/snow, /obj/effect/overmap/visitable/sector/exoplanet/desert) var/list/cargo_price_coef = list("nt" = 1, "hpi" = 1, "zhu" = 1, "een" = 1, "get" = 1, "arz" = 1, "blm" = 1, diff --git a/code/modules/background/space_sectors/tauceti.dm b/code/modules/background/space_sectors/tauceti.dm index 172d0ac1b8a..73b53074ae5 100644 --- a/code/modules/background/space_sectors/tauceti.dm +++ b/code/modules/background/space_sectors/tauceti.dm @@ -6,7 +6,9 @@ cargo_price_coef = list("nt" = 0.8, "hpi" = 0.8, "zhu" = 0.8, "een" = 1, "get" = 0.8, "arz" = 1, "blm" = 1, "iac" = 1, "zsc" = 1, "vfc" = 1, "bis" = 0,8, "xmg" = 0.8, "npi" = 0.8) possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/barren) - starlight_color = "#96bcde" + starlight_color = "#9cd0fd" + starlight_power = 5 + starlight_range = 2 /datum/space_sector/romanovich name = SECTOR_ROMANOVICH @@ -15,7 +17,9 @@ sources of Phoron, a volatile but highly-sought after compound, known for its uses in the biomedical and energy industries. Most of the sources of Phoron within the Romanovich \ Cloud are under control of NanoTrasen, which has consequently established many high-tech research facilities in the area in the past few years." possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/romanovich) - starlight_color = "#96bcde" + starlight_color = "#9cd0fd" + starlight_power = 5 + starlight_range = 2 meteors_minor = list( /obj/effect/meteor/medium = 80, @@ -106,4 +110,6 @@ two factors: the presence of the lingering Stellar Corporate Conglomerate, and the federal authority of the Republic of Biesel backing them up. Warlords and major antagonistic \ factions (to Biesel) generally refrain from entering these territories to avoid the ire of the Conglomerate, much less the repercussions of engaging its allies." possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove) - starlight_color = COLOR_BLUE_LIGHT \ No newline at end of file + starlight_color = "#9cd0fd" + starlight_power = 5 + starlight_range = 2 \ No newline at end of file diff --git a/config/example/config.txt b/config/example/config.txt index c0ad7b0b59c..811ce1cc437 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -401,7 +401,7 @@ EVENT_CUSTOM_START_MAJOR 80;100 ## Respawn delay in minutes before one may respawn as a crew member. #RESPAWN_DELAY 30 -## Strength of ambient star light. Set to 0 or less to turn off. A value of 1 is unlikely to have a noticeable effect in most lighting systems. +## Determines whether or not starlight is enabled. 0 will disable starlight, any other number will enable it. STARLIGHT 0 ## If defined, starlight applies to open space turfs as well. Causes a significant number of lighting updates at round-start, may increase server's memory usage. diff --git a/html/changelogs/dansemacabre-starlightbuffs.yml b/html/changelogs/dansemacabre-starlightbuffs.yml new file mode 100644 index 00000000000..23094a223ef --- /dev/null +++ b/html/changelogs/dansemacabre-starlightbuffs.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: TheDanseMacabre + +# 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: + - tweak: "Starlight strength and range is now dictacted on a per-sector basis instead of relying on the config."