praise the good lord, for the game finally compiles

This commit is contained in:
duncathan
2016-03-29 19:04:37 -06:00
parent 3f1375ba39
commit e86cf0f280
195 changed files with 10565 additions and 10467 deletions
+4 -2
View File
@@ -76,7 +76,7 @@
continue
if(platingRequired)
if(istype(B, /turf/space))
if(istype(B, /turf/open/space))
continue
var/old_dir1 = T.dir
@@ -101,7 +101,9 @@
var/global/list/forbidden_vars = list("type","stat","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "luminosity")
for(var/V in T.vars - forbidden_vars)
if(V == "air")
X.air.copy_from(T.air)
var/turf/open/O1 = X
var/turf/open/O2 = T
O1.air.copy_from(O2.air)
continue
X.vars[V] = T.vars[V]
toupdate += X
+1 -1
View File
@@ -143,7 +143,7 @@
/obj/machinery/computer/holodeck/proc/floorcheck()
for(var/turf/T in linked)
if(!T.intact || istype(T,/turf/space))
if(!T.intact || istype(T,/turf/open/space))
return 0
return 1
+1 -1
View File
@@ -66,7 +66,7 @@
/turf/open/floor/holofloor/carpet
name = "Carpet"
desc = "Electrically inviting."
icon = 'icons/turf/open/floors/carpet.dmi'
icon = 'icons/turf/floors/carpet.dmi'
icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")