cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

There's some changes in here I wasn't expecting. HMM

Browse Source
This commit is contained in:
Razgriz
2021-06-17 23:00:04 -07:00
committed by GitHub
parent 3b0f1d91b7
commit c4414f8fe3
1 changed files with 16 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
code/modules/lighting/lighting_fake_sun_vr.dm
View File

@@ -18,6 +18,22 @@
"brightness" = 2.5, "brightness" = 2.5,
"color" = "#EE9AC6" "color" = "#EE9AC6"
), ),
list(
"brightness" = 1.5,
"color" = "#F07AD8"
),
list(
"brightness" = 1.5,
"color" = "#61AEF3"
),
list(
"brightness" = 1,
"color" = "#f3932d"
),
list(
"brightness" = 1,
"color" = "#631E8A"
),
list( list(
"brightness" = 1.0, "brightness" = 1.0,
"color" = "#A3A291" "color" = "#A3A291"
@@ -90,99 +106,6 @@
if(T.outdoors) if(T.outdoors)
turfs_to_use += T turfs_to_use += T
<<<<<<< HEAD
for(var/turf/simulated/T as anything in turfs)
if(!T.lighting_overlay)
T.lighting_build_overlay()
if(!T.outdoors)
continue
for(var/C in T.get_corners())
var/datum/lighting_corner/LC = C
if(LC.update_gen != update_gen && LC.active)
LC.update_gen = update_gen
LC.update_lumcount(lum_r, lum_g, lum_b)
update_gen--
qdel(src)
||||||| parent of 8b447d8b1d... Merge pull request #10662 from VOREStation/Arokha/lights2
for(var/turf/simulated/T as anything in turfs)
if(!T.lighting_overlay)
T.lighting_build_overlay()
if(!T.outdoors)
continue
for(var/C in T.get_corners())
var/datum/lighting_corner/LC = C
if(LC.update_gen != update_gen && LC.active)
LC.update_gen = update_gen
LC.update_lumcount(lum_r, lum_g, lum_b)
update_gen--
qdel(src)
/obj/effect/fake_sun/warm
name = "warm fake sun"
desc = "Deletes itself, but first updates all the lighting on outdoor turfs to warm colors."
possible_light_setups = list(
list(
"brightness" = 6.0,
"color" = "#E9FFB8"
),
list(
"brightness" = 4.0,
"color" = "#F4EA55"
),
list(
"brightness" = 1.0,
"color" = "#F07AD8"
),
list(
"brightness" = 1.0,
"color" = "#b4361f"
),
list(
"brightness" = 0.7,
"color" = "#f3932d"
),
list(
"brightness" = 0.1,
"color" = "#B92B00"
)
)
/obj/effect/fake_sun/cool
name = "fake sun"
desc = "Deletes itself, but first updates all the lighting on outdoor turfs to cool colors."
possible_light_setups = list(
list(
"brightness" = 6.0,
"color" = "#abfff7"
),
list(
"brightness" = 4.0,
"color" = "#2e30c9"
),
list(
"brightness" = 1.0,
"color" = "#61AEF3"
),
list(
"brightness" = 1.0,
"color" = "#61ddf3"
),
list(
"brightness" = 0.3,
"color" = "#253682"
),
list(
"brightness" = 0.1,
"color" = "#27024B"
)
)
=======
if(!turfs_to_use.len) if(!turfs_to_use.len)
warning("Fake sun placed on a level where it can't find any outdoor turfs to color at [x],[y],[z].") warning("Fake sun placed on a level where it can't find any outdoor turfs to color at [x],[y],[z].")
return return
@@ -254,4 +177,3 @@
"color" = "#27024B" "color" = "#27024B"
) )
) )
>>>>>>> 8b447d8b1d... Merge pull request #10662 from VOREStation/Arokha/lights2