Quick sync (#2587)

* sync since the mirror was down

* fucking byond

* can't forget these
This commit is contained in:
LetterJay
2017-09-04 04:38:49 -05:00
committed by Poojawa
parent 241a10d88d
commit 92e055be97
20 changed files with 336 additions and 70 deletions
+2 -2
View File
@@ -117,10 +117,10 @@
/turf/open/floor/proc/make_plating()
return ChangeTurf(/turf/open/floor/plating)
/turf/open/floor/ChangeTurf(new_path)
/turf/open/floor/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
if(!isfloorturf(src))
return ..() //fucking turfs switch the fucking src of the fucking running procs
if(!ispath(new_path, /turf/open/floor))
if(!ispath(path, /turf/open/floor))
return ..()
var/old_icon = icon_regular_floor
var/old_dir = dir
@@ -43,7 +43,7 @@
icon_state = "light_off"
/turf/open/floor/light/ChangeTurf(turf/T)
/turf/open/floor/light/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
set_light(0)
return ..()
@@ -273,7 +273,7 @@
if(prob(50))
ChangeTurf(src.baseturf)
/turf/open/floor/vines/ChangeTurf(turf/open/floor/T)
/turf/open/floor/vines/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
. = ..()
//Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
for(var/obj/structure/spacevine/SV in src)
@@ -116,7 +116,7 @@
be_removed()
return ..()
/turf/open/floor/engine/cult/ChangeTurf(path, defer_change = FALSE)
/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
if(path != type)
be_removed()
return ..()