mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
Shuttles and Centcom now have dynamic lighting (#24993)
* Shuttles now have dynamic lighting * heh * there we go * Centcom now supports light tm * fixes the supply shuttle * statue * new and improved
This commit is contained in:
@@ -219,7 +219,8 @@ var/list/bloody_footprints_cache = list()
|
||||
//lighting area defines
|
||||
#define DYNAMIC_LIGHTING_DISABLED 0 //dynamic lighting disabled (area stays at full brightness)
|
||||
#define DYNAMIC_LIGHTING_ENABLED 1 //dynamic lighting enabled
|
||||
#define DYNAMIC_LIGHTING_IFSTARLIGHT 2 //dynamic lighting enabled only if starlight is.
|
||||
#define DYNAMIC_LIGHTING_FORCED 2 //dynamic lighting enabled even if the area doesn't require power
|
||||
#define DYNAMIC_LIGHTING_IFSTARLIGHT 3 //dynamic lighting enabled only if starlight is.
|
||||
#define IS_DYNAMIC_LIGHTING(A) ( A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT ? config.starlight : A.dynamic_lighting )
|
||||
|
||||
//subtypesof(), typesof() without the parent path
|
||||
|
||||
@@ -111,7 +111,10 @@ var/list/teleportlocs = list()
|
||||
power_equip = 1
|
||||
power_environ = 1
|
||||
|
||||
if (dynamic_lighting != DYNAMIC_LIGHTING_IFSTARLIGHT)
|
||||
if(dynamic_lighting == DYNAMIC_LIGHTING_FORCED)
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
luminosity = 0
|
||||
else if(dynamic_lighting != DYNAMIC_LIGHTING_IFSTARLIGHT)
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
..()
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
/area/centcom
|
||||
name = "Centcom"
|
||||
icon_state = "centcom"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = 0
|
||||
has_gravity = 1
|
||||
noteleport = 1
|
||||
@@ -33,16 +34,19 @@
|
||||
/area/tdome
|
||||
name = "Thunderdome"
|
||||
icon_state = "yellow"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = 0
|
||||
has_gravity = 1
|
||||
|
||||
/area/tdome/arena
|
||||
name = "Thunderdome Arena"
|
||||
icon_state = "thunder"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/tdome/arena_source
|
||||
name = "Thunderdome Arena Template"
|
||||
icon_state = "thunder"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/tdome/tdome1
|
||||
name = "Thunderdome (Team 1)"
|
||||
@@ -91,6 +95,7 @@
|
||||
/area/syndicate_mothership/control
|
||||
name = "Syndicate Control Room"
|
||||
icon_state = "syndie-control"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/syndicate_mothership/elite_squad
|
||||
name = "Syndicate Elite Squad"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/area/shuttle
|
||||
name = "Shuttle"
|
||||
requires_power = 0
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
has_gravity = 1
|
||||
always_unpowered = 0
|
||||
valid_territory = 0
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
var/list/empty_shuttle_turfs = list()
|
||||
for(var/turf/open/floor/T in SSshuttle.supply.areaInstance)
|
||||
if(T.density || T.contents.len)
|
||||
if(is_blocked_turf(T))
|
||||
continue
|
||||
empty_shuttle_turfs += T
|
||||
if(!empty_shuttle_turfs.len)
|
||||
|
||||
@@ -72,7 +72,7 @@ var/list/blacklisted_cargo_types = typecacheof(list(
|
||||
|
||||
var/list/empty_turfs = list()
|
||||
for(var/turf/open/floor/T in areaInstance)
|
||||
if(T.density || T.contents.len)
|
||||
if(is_blocked_turf(T))
|
||||
continue
|
||||
empty_turfs += T
|
||||
|
||||
|
||||
Reference in New Issue
Block a user