cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas.dm
+2 -2
View File
@@ -55,7 +55,7 @@
)
var/list/forced_ambience = null
var/sound_env = STANDARD_STATION
var/turf/base_turf//The base turf type of the area, which can be used to override the z-level's base turf
var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
var/no_light_control = 0 // if 1, lights in area cannot be toggled with light controller
var/allow_nightmode = 0 // if 1, lights in area will be darkened by the night mode controller
var/station_area = 0
@@ -211,7 +211,7 @@
#define DO_PARTY(COLOR) animate(color = COLOR, time = 0.5 SECONDS, easing = QUAD_EASING)
/area/update_icon()
if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space))//If it doesn't require power, can still activate this proc.
if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space)) //If it doesn't require power, can still activate this proc.
if(fire && !eject && !party) // FIRE
color = "#ff9292"
animate(src) // stop any current animations.