From bdfb4af5c20957a7e9a84bae1bfe96890d41e51c Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sat, 4 May 2019 03:38:21 +0200 Subject: [PATCH] Starlight fixes --- code/controllers/configuration.dm | 3 +-- code/game/area/Space Station 13 areas.dm | 2 +- code/game/turfs/space/space.dm | 2 +- config/example/config.txt | 5 +++-- icons/turf/areas.dmi | Bin 34810 -> 34945 bytes 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 12b5b0fd1a5..90fa1a0ceac 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -605,8 +605,7 @@ config.event_delay_upper[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3]) if("starlight") - var/vvalue = text2num(value) - config.starlight = vvalue >= 0 ? vvalue : 0 + config.starlight = 1 if("player_reroute_cap") var/vvalue = text2num(value) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 82fe75b3cf7..c0456b67778 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -97,7 +97,7 @@ var/list/ghostteleportlocs = list() no_teleportlocs = TRUE requires_power = FALSE valid_territory = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_FORCED + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED /area/shuttle/arrival name = "\improper Arrival Shuttle" diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 342c7f23ff1..cd1e0995b20 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -57,7 +57,7 @@ if(isspaceturf(t)) //let's NOT update this that much pls continue - set_light(config.starlight) + set_light(2) return set_light(0) diff --git a/config/example/config.txt b/config/example/config.txt index a0d733eacd1..6e54e2af1f6 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -317,8 +317,9 @@ EVENT_DELAY_UPPER 15;45;70 #EVENT_CUSTOM_START_MODERATE 30;45 EVENT_CUSTOM_START_MAJOR 80;100 -## Strength of ambient star light. Set to 0 or less to turn off. -STARLIGHT 2 +## Starlight for exterior walls and breaches. Uncomment for starlight! +## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting +#STARLIGHT ## Player rerouting stuff ## If not 0, players can be rerouted to an overflow server after a certain cap is reached diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index cfce55cf6fbf4add4208415eaf15cdb1c194046f..87e919f1f0943dfa3daed5ed9561e7c3e861e91e 100755 GIT binary patch delta 6201 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