Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Planetary Lighting Colors #3419

Merged
merged 27 commits into from
Oct 29, 2024
Merged

Planetary Lighting Colors #3419

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c325b0d
guh
Erikafox Sep 23, 2024
7fefe3a
small alterations
Erikafox Sep 23, 2024
0b3149c
Merge remote-tracking branch 'upstream/master' into planetary-lighting
Erikafox Sep 23, 2024
651a33f
map fixes
Erikafox Sep 23, 2024
e2924ae
tfw baseturfs
Erikafox Sep 23, 2024
b4484f8
Update beach_ocean_town.dmm
Erikafox Sep 23, 2024
43ccc14
stupid 2014 turfs
Erikafox Sep 23, 2024
64170b2
uu
Erikafox Sep 23, 2024
066912f
Update beach_crashed_engineer.dmm
Erikafox Sep 23, 2024
bb8aa48
Merge branch 'master' into planetary-lighting
Erikafox Sep 29, 2024
8239287
Update wasteplanet.dm
Erikafox Oct 7, 2024
77a58cc
Merge branch 'master' into planetary-lighting
Erikafox Oct 11, 2024
e726afe
Update code/game/objects/effects/glowshroom.dm
FalloutFalcon Oct 18, 2024
637312d
Merge branch 'master' into planetary-lighting
FalloutFalcon Oct 22, 2024
f545073
Merge branch 'master' into planetary-lighting
rye-rice Oct 23, 2024
c864877
Merge remote-tracking branch 'upstream/master' into planetary-lighting
Erikafox Oct 24, 2024
ae6afc7
Merge remote-tracking branch 'upstream/master' into planetary-lighting
Erikafox Oct 26, 2024
bcd2746
Merge branch 'master' into planetary-lighting
Sun-Soaked Oct 26, 2024
466a8b9
Merge branch 'master' into planetary-lighting
Erikafox Oct 26, 2024
3663312
reduce intensities
Erikafox Oct 26, 2024
9bda7d3
Update colors.dm
Erikafox Oct 26, 2024
1abd238
Merge remote-tracking branch 'upstream/master' into planetary-lighting
Erikafox Oct 28, 2024
8f7bb22
Update whitesands.dm
Erikafox Oct 28, 2024
bddc1e3
Merge branch 'master' into planetary-lighting
Sun-Soaked Oct 28, 2024
2618114
Merge branch 'master' into planetary-lighting
Erikafox Oct 28, 2024
d61e7c6
Merge branch 'master' into planetary-lighting
Erikafox Oct 28, 2024
f03b4c5
figured it out
Erikafox Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 73 additions & 154 deletions _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"ca" = (
Expand Down Expand Up @@ -343,7 +343,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"jQ" = (
Expand Down Expand Up @@ -548,7 +548,7 @@
pixel_y = 13
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"pr" = (
Expand Down Expand Up @@ -1396,7 +1396,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Kv" = (
Expand Down Expand Up @@ -1548,7 +1548,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NU" = (
Expand All @@ -1560,7 +1560,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NV" = (
Expand Down
30 changes: 15 additions & 15 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"dT" = (
Expand Down Expand Up @@ -618,7 +618,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"hG" = (
Expand Down Expand Up @@ -953,7 +953,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"mc" = (
Expand Down Expand Up @@ -991,7 +991,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"mt" = (
Expand Down Expand Up @@ -1132,7 +1132,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"oF" = (
Expand Down Expand Up @@ -1346,7 +1346,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"rN" = (
Expand Down Expand Up @@ -1683,7 +1683,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"wu" = (
Expand Down Expand Up @@ -1917,7 +1917,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"yQ" = (
Expand Down Expand Up @@ -2270,7 +2270,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"De" = (
Expand Down Expand Up @@ -2408,7 +2408,7 @@
layer = 2.01
},
/turf/open/floor/carpet/purple{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Eu" = (
Expand Down Expand Up @@ -3052,7 +3052,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"KD" = (
Expand Down Expand Up @@ -3171,7 +3171,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"LR" = (
Expand Down Expand Up @@ -3448,7 +3448,7 @@
desc = "100% pure cotton!"
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"OR" = (
Expand Down Expand Up @@ -3519,7 +3519,7 @@
layer = 2.01
},
/turf/open/floor/carpet/purple{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Pv" = (
Expand Down Expand Up @@ -3859,7 +3859,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"UH" = (
Expand Down
Loading
Loading