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

Revert "Merge pull request #4513 from Aryn/master"

Browse Source 
This reverts commit fa88663c23, reversing
changes made to 608c48c6db.
This commit is contained in:
Mloc-Hibernia
2014-03-24 13:55:23 +00:00
parent 1233e5568f
commit 34c39e773a
4 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/WorkInProgress/Aryn/Lighting/Controller.dm
View File

@@ -76,7 +76,7 @@ var/list/lit_z_levels = list(1,5)
world << "<font color=red>Progress: [round((turfs_updated/total_turfs)*100, 0.01)]% ([turfs_updated]/[total_turfs])" world << "<font color=red>Progress: [round((turfs_updated/total_turfs)*100, 0.01)]% ([turfs_updated]/[total_turfs])"
var/turf/T = locate(x,y,z) var/turf/T = locate(x,y,z)
if(!T.is_outside) if(!T.light_overlay && !T.is_outside)
T.light_overlay = new(T) T.light_overlay = new(T)
//T.ResetValue() //T.ResetValue()
if(!all_lightpoints_made) new/lightpoint(x+0.5,y+0.5,z) if(!all_lightpoints_made) new/lightpoint(x+0.5,y+0.5,z)
@@ -89,8 +89,7 @@ var/list/lit_z_levels = list(1,5)
started = 1 started = 1
for(var/turf/T) for(var/turf/T)
if(!T.is_outside && T.light_overlay) if(T.light_overlay)
T.ResetValue() T.ResetValue()
T.UpdateLight() T.UpdateLight()

14
code/WorkInProgress/Aryn/Lighting/Engine.dm
View File

@@ -53,9 +53,8 @@ Turf Procs:
#define LIGHTCLAMP(x) ( max(0,min(3,round(x,1))) ) #define LIGHTCLAMP(x) ( max(0,min(3,round(x,1))) )
atom/movable/lighting_overlay obj/effect/lighting_overlay
name = "" //anchored = 1
anchored = 1
layer = 9 layer = 9
mouse_opacity = 0 mouse_opacity = 0
icon = 'icons/effects/ArynLights.dmi' icon = 'icons/effects/ArynLights.dmi'
@@ -64,7 +63,7 @@ atom/movable/lighting_overlay
atom/var/light/light atom/var/light/light
turf/var/atom/movable/lighting_overlay/light_overlay turf/var/obj/effect/lighting_overlay/light_overlay
turf/var/lit_value = 0 turf/var/lit_value = 0
turf/var/max_brightness = 0 turf/var/max_brightness = 0
@@ -169,13 +168,6 @@ turf/proc/ResetAllLights()
for(var/light/light in lit_by) for(var/light/light in lit_by)
light.Reset() light.Reset()
/turf/space/ResetAllLights()
var/atom/movable/lighting_overlay/overlay = locate() in src
overlay.loc = null
light_overlay = null
is_outside = 1
. = ..()
turf/proc/ResetValue() turf/proc/ResetValue()
if(is_outside) if(is_outside)
max_brightness = lighting_controller.starlight max_brightness = lighting_controller.starlight

15
code/WorkInProgress/Aryn/Lighting/Lightpoint.dm
View File

@@ -52,14 +52,9 @@ lightpoint
proc/max_value() proc/max_value()
if(cached_value < 0) if(cached_value < 0)
var var
valueA = value_of(NW) valueA = (NW?(NW.lit_value):0)
valueB = value_of(NE) valueB = (NE?(NE.lit_value):0)
valueC = value_of(SW) valueC = (SW?(SW.lit_value):0)
valueD = value_of(SE) valueD = (SE?(SE.lit_value):0)
cached_value = max(valueA,valueB,valueC,valueD) cached_value = max(valueA,valueB,valueC,valueD)
return cached_value return cached_value
proc/value_of(turf/T)
if(!T) return 0
if(T.is_outside) return min(lighting_controller.starlight,3)
return T.lit_value

4
code/game/supplyshuttle.dm
View File

@@ -1,8 +1,8 @@
//Config stuff //Config stuff
#define SUPPLY_DOCKZ 2 //Z-level of the Dock. #define SUPPLY_DOCKZ 2 //Z-level of the Dock.
#define SUPPLY_STATIONZ 1 //Z-level of the Station. #define SUPPLY_STATIONZ 1 //Z-level of the Station.
#define SUPPLY_STATION_AREATYPE /area/supply/station //Type of the supply shuttle area for station #define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station
#define SUPPLY_DOCK_AREATYPE /area/supply/dock //Type of the supply shuttle area for dock #define SUPPLY_DOCK_AREATYPE "/area/supply/dock" //Type of the supply shuttle area for dock
var/datum/controller/supply_shuttle/supply_shuttle = new() var/datum/controller/supply_shuttle/supply_shuttle = new()