Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins

This commit is contained in:
Crazylemon64
2016-07-02 15:37:58 -07:00
215 changed files with 5542 additions and 3288 deletions
+4
View File
@@ -952,6 +952,10 @@ var/list/ghostteleportlocs = list()
power_light = 0
power_environ = 0
/area/maintenance/consarea
name = "Alternate Construction Area"
icon_state = "yellow"
//Hallway