Merge branch 'master' into diagonal-movement

This commit is contained in:
Couls
2019-05-22 14:24:54 -04:00
committed by GitHub
497 changed files with 10268 additions and 9477 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
/obj/proc/color_windows(obj/W)
var/list/wcBarAreas = list(/area/crew_quarters/bar)
var/list/wcBrigAreas = list(/area/security,/area/prison,/area/shuttle/gamma)
var/list/wcBrigAreas = list(/area/security, /area/shuttle/gamma)
var/newcolor
var/turf/T = get_turf(W)