ChangeTurf icon fix

This commit is contained in:
Mark van Alphen
2019-06-03 03:25:48 +02:00
parent 6aba8f9e52
commit 2c4c378775
6 changed files with 23 additions and 17 deletions
+12 -3
View File
@@ -120,14 +120,23 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
/turf/simulated/floor/proc/make_plating()
return ChangeTurf(/turf/simulated/floor/plating)
/turf/simulated/floor/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, ignore_air = FALSE)
if(!istype(src,/turf/simulated/floor))
/turf/simulated/floor/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
if(!istype(src, /turf/simulated/floor))
return ..() //fucking turfs switch the fucking src of the fucking running procs
if(!ispath(T,/turf/simulated/floor))
if(!ispath(T, /turf/simulated/floor))
return ..()
var/old_icon = icon_regular_floor
var/old_plating = icon_plating
var/old_dir = dir
var/turf/simulated/floor/W = ..()
if(keep_icon)
W.icon_regular_floor = old_icon
W.icon_plating = old_plating
W.dir = old_dir
W.update_icon()
return W
+4 -1
View File
@@ -72,7 +72,10 @@
var/obj/item/stack/tile/Z = W
if(!Z.use(1))
return
ChangeTurf(Z.turf_type)
if(istype(Z, /obj/item/stack/tile/plasteel)) // Turn asteroid floors into plating by default
ChangeTurf(/turf/simulated/floor/plating, keep_icon = FALSE)
else
ChangeTurf(Z.turf_type, keep_icon = FALSE)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
/turf/simulated/floor/plating/asteroid/gets_drilled()
@@ -254,3 +254,6 @@
/turf/simulated/floor/plating/abductor2/burn_tile()
return //unburnable
/turf/simulated/floor/plating/abductor2/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
@@ -287,12 +287,3 @@
/turf/simulated/floor/plating/abductor/New()
..()
icon_state = "alienpod[rand(1,9)]"
/turf/simulated/floor/plating/abductor/break_tile()
return //unbreakable
/turf/simulated/floor/plating/abductor/burn_tile()
return //unburnable
/turf/simulated/floor/plating/abductor/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
+3 -3
View File
@@ -180,11 +180,11 @@
if(L)
qdel(L)
/turf/proc/TerraformTurf(path, defer_change = FALSE, ignore_air = FALSE)
return ChangeTurf(path, defer_change, ignore_air)
/turf/proc/TerraformTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
return ChangeTurf(path, defer_change, keep_icon, ignore_air)
//Creates a new turf
/turf/proc/ChangeTurf(path, defer_change = FALSE, ignore_air = FALSE)
/turf/proc/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
if(!path)
return
if(!use_preloader && path == type) // Don't no-op if the map loader requires it to be reconstructed
@@ -321,7 +321,7 @@ var/global/dmm_suite/preloader/_preloader = new
var/turf/T = locate(x,y,z)
if(T)
if(ispath(path, /turf))
T.ChangeTurf(path, TRUE)
T.ChangeTurf(path, defer_change = TRUE, keep_icon = FALSE)
instance = T
else if(ispath(path, /area))