Merge pull request #9864 from variableundefined/ManualRevert

Manually revert Purpose's smoothing PR
This commit is contained in:
Fox McCloud
2018-10-19 19:16:00 -04:00
committed by GitHub
5 changed files with 1 additions and 8 deletions
-1
View File
@@ -180,7 +180,6 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
var/turf/simulated/floor/plating/P = pry_tile(CB, user, TRUE)
if(!istype(P))
return
update_icon()
P.attackby(T, user, params)
/turf/simulated/floor/proc/pry_tile(obj/item/C, mob/user, silent = FALSE)
@@ -15,9 +15,6 @@
/turf/simulated/floor/plating/New()
..()
icon_plating = icon_state
if(icon == 'icons/turf/floors/plating.dmi')
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/simulated/floor/plating, /turf/space)
update_icon()
/turf/simulated/floor/plating/update_icon()
@@ -25,7 +22,6 @@
return
if(!broken && !burnt)
icon_state = icon_plating //Because asteroids are 'platings' too.
underlays += image(icon, icon_state)
/turf/simulated/floor/plating/attackby(obj/item/C, mob/user, params)
if(..())
-2
View File
@@ -226,8 +226,6 @@
for(var/obj/structure/cable/C in contents)
qdel(C)
smooth_icon(src)
/turf/simulated/AfterChange(ignore_air, keep_cabling = FALSE)
..()
RemoveLattice()
+1 -1
View File
@@ -462,10 +462,10 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/floor/plating/airless/asteroid/New()
var/proper_name = name
..()
name = proper_name
if(prob(20))
icon_state = "asteroid[rand(0,12)]"
..()
/turf/simulated/floor/plating/airless/asteroid/ex_act(severity, target)
switch(severity)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB