diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 2a6c9e1d51c..860e328ef51 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -6853,11 +6853,7 @@
/area/centcom/ferry)
"py" = (
/obj/machinery/smartfridge,
-/turf/closed/indestructible{
- icon = 'icons/turf/walls/wood_wall.dmi';
- icon_state = "wood";
- smooth = 1
- },
+/turf/closed/indestructible/wood,
/area/centcom/holding)
"pz" = (
/turf/open/space/basic,
@@ -12257,11 +12253,7 @@
/area/wizard_station)
"BV" = (
/obj/machinery/chem_dispenser/drinks/beer,
-/turf/closed/indestructible{
- icon = 'icons/turf/walls/wood_wall.dmi';
- icon_state = "wood";
- smooth = 1
- },
+/turf/closed/indestructible/wood,
/area/centcom/holding)
"BY" = (
/obj/item/toy/figure/syndie,
@@ -13597,11 +13589,7 @@
/area/wizard_station)
"ED" = (
/obj/machinery/vending/boozeomat,
-/turf/closed/indestructible{
- icon = 'icons/turf/walls/wood_wall.dmi';
- icon_state = "wood";
- smooth = 1
- },
+/turf/closed/indestructible/wood,
/area/centcom/holding)
"EE" = (
/obj/structure/closet/crate/bin,
@@ -17074,11 +17062,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"Nd" = (
-/turf/closed/indestructible{
- icon = 'icons/turf/walls/wood_wall.dmi';
- icon_state = "wood";
- smooth = 1
- },
+/turf/closed/indestructible/wood,
/area/centcom/holding)
"Nh" = (
/obj/structure/table/wood,
@@ -17503,11 +17487,7 @@
/area/centcom/supplypod)
"QT" = (
/obj/machinery/chem_dispenser/drinks,
-/turf/closed/indestructible{
- icon = 'icons/turf/walls/wood_wall.dmi';
- icon_state = "wood";
- smooth = 1
- },
+/turf/closed/indestructible/wood,
/area/centcom/holding)
"QW" = (
/obj/structure/closet/secure_closet/freezer/kitchen{
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index be5537e70ae..0c19e80cfe1 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -2,7 +2,7 @@
//generic (by snowflake) tile smoothing code; smooth your icons with this!
/*
Each tile is divided in 4 corners, each corner has an appearance associated to it; the tile is then overlayed by these 4 appearances
- To use this, just set your atom's 'smooth' var to 1. If your atom can be moved/unanchored, set its 'can_be_unanchored' var to 1.
+ To use this, just set your atom's 'smoothing_flags' var to 1. If your atom can be moved/unanchored, set its 'can_be_unanchored' var to 1.
If you don't want your atom's icon to smooth with anything but atoms of the same type, set the list 'canSmoothWith' to null;
Otherwise, put all types you want the atom icon to smooth with in 'canSmoothWith' INCLUDING THE TYPE OF THE ATOM ITSELF.
@@ -10,7 +10,7 @@
DIAGONAL SMOOTHING INSTRUCTIONS
To make your atom smooth diagonally you need all the proper icon states (see 'smooth_wall.dmi' for a template) and
- to add the 'SMOOTH_DIAGONAL' flag to the atom's smooth var (in addition to either SMOOTH_TRUE or SMOOTH_MORE).
+ to add the 'SMOOTH_DIAGONAL' flag to the atom's smoothing_flags var (in addition to either SMOOTH_TRUE or SMOOTH_MORE).
For turfs, what appears under the diagonal corners depends on the turf that was in the same position previously: if you make a wall on
a plating floor, you will see plating under the diagonal wall corner, if it was space, you will see space.
@@ -33,10 +33,9 @@
#define N_SOUTHEAST (1<<6)
#define N_SOUTHWEST (1<<10)
-#define SMOOTH_FALSE 0 //not smooth
#define SMOOTH_TRUE (1<<0) //smooths with exact specified types or just itself
#define SMOOTH_MORE (1<<1) //smooths with all subtypes of specified types or just itself (this value can replace SMOOTH_TRUE)
-#define SMOOTH_DIAGONAL (1<<2) //if atom should smooth diagonally, this should be present in 'smooth' var
+#define SMOOTH_DIAGONAL (1<<2) //if atom should smooth diagonally, this should be present in 'smoothing_flags' var
#define SMOOTH_BORDER (1<<3) //atom will smooth with the borders of the map
#define SMOOTH_QUEUED (1<<4) //atom is currently queued to smooth.
@@ -46,7 +45,7 @@
#define DEFAULT_UNDERLAY_ICON_STATE "plating"
-#define QUEUE_SMOOTH(thing_to_queue) if(thing_to_queue.smooth) {SSicon_smooth.add_to_queue(thing_to_queue)}
+#define QUEUE_SMOOTH(thing_to_queue) if(thing_to_queue.smoothing_flags) {SSicon_smooth.add_to_queue(thing_to_queue)}
#define QUEUE_SMOOTH_NEIGHBORS(thing_to_queue) for(var/neighbor in orange(1, thing_to_queue)) {var/atom/atom_neighbor = neighbor; QUEUE_SMOOTH(atom_neighbor)}
@@ -66,7 +65,7 @@
for(var/direction in GLOB.cardinals)
AM = find_type_in_direction(A, direction)
if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
+ if((A.smoothing_flags & SMOOTH_BORDER))
adjacencies |= 1 << direction
else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
adjacencies |= 1 << direction
@@ -75,14 +74,14 @@
if(adjacencies & N_WEST)
AM = find_type_in_direction(A, NORTHWEST)
if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
+ if((A.smoothing_flags & SMOOTH_BORDER))
adjacencies |= N_NORTHWEST
else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
adjacencies |= N_NORTHWEST
if(adjacencies & N_EAST)
AM = find_type_in_direction(A, NORTHEAST)
if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
+ if((A.smoothing_flags & SMOOTH_BORDER))
adjacencies |= N_NORTHEAST
else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
adjacencies |= N_NORTHEAST
@@ -91,14 +90,14 @@
if(adjacencies & N_WEST)
AM = find_type_in_direction(A, SOUTHWEST)
if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
+ if((A.smoothing_flags & SMOOTH_BORDER))
adjacencies |= N_SOUTHWEST
else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
adjacencies |= N_SOUTHWEST
if(adjacencies & N_EAST)
AM = find_type_in_direction(A, SOUTHEAST)
if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
+ if((A.smoothing_flags & SMOOTH_BORDER))
adjacencies |= N_SOUTHEAST
else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
adjacencies |= N_SOUTHEAST
@@ -107,17 +106,17 @@
//do not use, use QUEUE_SMOOTH(atom)
/proc/smooth_icon(atom/A)
- if(!A || !A.smooth)
+ if(!A || !A.smoothing_flags)
return
- A.smooth &= ~SMOOTH_QUEUED
+ A.smoothing_flags &= ~SMOOTH_QUEUED
if (!A.z)
return
if(QDELETED(A))
return
- if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE))
+ if(A.smoothing_flags & (SMOOTH_TRUE | SMOOTH_MORE))
var/adjacencies = calculate_adjacencies(A)
- if(A.smooth & SMOOTH_DIAGONAL)
+ if(A.smoothing_flags & SMOOTH_DIAGONAL)
A.diagonal_smooth(adjacencies)
else
cardinal_smooth(A, adjacencies)
@@ -273,7 +272,7 @@
if(source.canSmoothWith)
var/atom/A
- if(source.smooth & SMOOTH_MORE)
+ if(source.smoothing_flags & SMOOTH_MORE)
for(var/a_type in source.canSmoothWith)
if( istype(target_turf, a_type) )
return target_turf
@@ -300,14 +299,14 @@
var/list/away_turfs = block(locate(1, 1, zlevel), locate(world.maxx, world.maxy, zlevel))
for(var/V in away_turfs)
var/turf/T = V
- if(T.smooth)
+ if(T.smoothing_flags)
if(now)
smooth_icon(T)
else
QUEUE_SMOOTH(T)
for(var/R in T)
var/atom/A = R
- if(A.smooth)
+ if(A.smoothing_flags)
if(now)
smooth_icon(A)
else
@@ -379,5 +378,5 @@
name = "smooth wall"
icon = 'icons/turf/smooth_wall.dmi'
icon_state = "smooth"
- smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_TRUE|SMOOTH_DIAGONAL|SMOOTH_BORDER
canSmoothWith = null
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 9437689e36e..213301039d2 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -15,7 +15,7 @@ SUBSYSTEM_DEF(icon_smooth)
while(length(cached))
var/atom/smoothing_atom = cached[length(cached)]
cached.len--
- if(QDELETED(smoothing_atom) || !(smoothing_atom.smooth & SMOOTH_QUEUED))
+ if(QDELETED(smoothing_atom) || !(smoothing_atom.smoothing_flags & SMOOTH_QUEUED))
continue
if(smoothing_atom.flags_1 & INITIALIZED_1)
smooth_icon(smoothing_atom)
@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(icon_smooth)
while(length(queue))
var/atom/smoothing_atom = queue[length(queue)]
queue.len--
- if(QDELETED(smoothing_atom) || !(smoothing_atom.smooth & SMOOTH_QUEUED) || smoothing_atom.z <= 2)
+ if(QDELETED(smoothing_atom) || !(smoothing_atom.smoothing_flags & SMOOTH_QUEUED) || smoothing_atom.z <= 2)
continue
smooth_icon(smoothing_atom)
CHECK_TICK
@@ -60,15 +60,15 @@ SUBSYSTEM_DEF(icon_smooth)
/datum/controller/subsystem/icon_smooth/proc/add_to_queue(atom/thing)
- if(thing.smooth & SMOOTH_QUEUED)
+ if(thing.smoothing_flags & SMOOTH_QUEUED)
return
- thing.smooth |= SMOOTH_QUEUED
+ thing.smoothing_flags |= SMOOTH_QUEUED
smooth_queue += thing
if(!can_fire)
can_fire = TRUE
/datum/controller/subsystem/icon_smooth/proc/remove_from_queues(atom/thing)
- thing.smooth &= ~SMOOTH_QUEUED
+ thing.smoothing_flags &= ~SMOOTH_QUEUED
smooth_queue -= thing
blueprint_queue -= thing
deferred -= thing
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 9f517a4feae..950a9f765f6 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -100,7 +100,7 @@
var/chat_color_darkened
///Icon-smoothing behavior.
- var/smooth = SMOOTH_FALSE
+ var/smoothing_flags = NONE
///Smoothing variable
var/top_left_corner
///Smoothing variable
@@ -251,7 +251,7 @@
targeted_by = null
QDEL_NULL(light)
- if(smooth & SMOOTH_QUEUED)
+ if(smoothing_flags & SMOOTH_QUEUED)
SSicon_smooth.remove_from_queues(src)
return ..()
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 3f50982e453..7d66cc0733a 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -107,7 +107,7 @@
pass_flags = LETPASSTHROW
bar_material = SAND
climbable = TRUE
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/barricade/sandbags, /turf/closed/wall, /turf/closed/wall/r_wall, /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/closed/wall/rust, /turf/closed/wall/r_wall/rust, /obj/structure/barricade/security)
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index de6bbaaf46a..77d3ce0fb43 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -129,7 +129,7 @@
return
// Deny placing posters on currently-diagonal walls, although the wall may change in the future.
- if (smooth & SMOOTH_DIAGONAL)
+ if (smoothing_flags & SMOOTH_DIAGONAL)
for (var/O in overlays)
var/image/I = O
if(copytext(I.icon_state, 1, 3) == "d-") //3 == length("d-") + 1
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index d47f3ea40ab..b6d2a3e2c16 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -54,7 +54,7 @@
desc = "Someone should clean that up."
icon_state = "dirt"
canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/closed/wall, /obj/structure/falsewall)
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
beauty = -75
@@ -62,7 +62,7 @@
. = ..()
var/turf/T = get_turf(src)
if(T.tiled_dirt)
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
icon = 'icons/effects/dirt.dmi'
icon_state = ""
QUEUE_SMOOTH(src)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index bbe58658bb5..8f98c84ea57 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -18,7 +18,7 @@
if (!armor)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
. = ..()
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
icon_state = ""
@@ -26,7 +26,7 @@
/obj/structure/Destroy()
GLOB.cameranet.updateVisibility(src)
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 29d192da39a..aaec915bef8 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -59,7 +59,7 @@
anchored = TRUE
canSmoothWith = list(/obj/structure/alien/resin)
max_integrity = 200
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
var/resintype = null
CanAtmosPass = ATMOS_PASS_DENSITY
@@ -114,7 +114,7 @@
icon_state = "weeds"
max_integrity = 15
canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall)
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
var/last_expand = 0 //last world.time this weed expanded
var/growth_cooldown_low = 150
var/growth_cooldown_high = 200
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index 9befac9047c..5f2d79e3b82 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/smooth_structures/alien/nest.dmi'
icon_state = "nest"
max_integrity = 120
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
can_be_unanchored = FALSE
canSmoothWith = null
buildstacktype = null
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 9b8fb5feb09..70a088a8e1b 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -19,7 +19,7 @@
/obj/structure/falsewall/reinforced,
/turf/closed/wall/rust,
/turf/closed/wall/r_wall/rust)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
can_be_unanchored = FALSE
CanAtmosPass = ATMOS_PASS_DENSITY
flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
@@ -63,14 +63,14 @@
if(opening)
if(density)
icon_state = "fwall_opening"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
clear_smooth_overlays()
else
icon_state = "fwall_closing"
else
if(density)
icon_state = initial(icon_state)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
QUEUE_SMOOTH(src)
else
icon_state = "fwall_open"
@@ -300,7 +300,7 @@
icon_state = "shuttle"
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/closed/wall/mineral/titanium
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/plastitanium
@@ -310,5 +310,5 @@
icon_state = "shuttle"
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/closed/wall/mineral/plastitanium
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 3f9acdb7ae6..f8082610ab2 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -253,7 +253,7 @@
desc = "A large bushy hedge."
icon = 'icons/obj/smooth_structures/hedge.dmi'
icon_state = "hedge"
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/fluff/hedge, /obj/structure/fluff/hedge/opaque)
density = TRUE
anchored = TRUE
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 32c5ca52798..993bed6f80a 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -31,7 +31,7 @@
var/ratio = obj_integrity / max_integrity
ratio = CEILING(ratio*4, 1) * 25
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
if(ratio > 50)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 75595234a14..8962f72dea7 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -15,7 +15,7 @@
/turf/open/floor,
/turf/closed/wall,
/obj/structure/falsewall)
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
// flags = CONDUCT_1
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
@@ -76,7 +76,7 @@
icon = 'icons/obj/smooth_structures/catwalk.dmi'
icon_state = "catwalk"
number_of_mats = 2
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
@@ -102,7 +102,7 @@
icon_state = "catwalk"
number_of_mats = 1
color = "#5286b9ff"
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
resistance_flags = FIRE_PROOF | LAVA_PROOF
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 481e165d49d..badc82ec316 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -32,7 +32,7 @@
custom_materials = list(/datum/material/iron = 2000)
max_integrity = 100
integrity_failure = 0.33
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced, /obj/structure/table/greyscale)
/obj/structure/table/examine(mob/user)
@@ -43,7 +43,7 @@
return "The top is screwed on, but the main bolts are also visible."
/obj/structure/table/update_icon()
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
@@ -251,7 +251,7 @@
name = "Rolling table"
desc = "An NT brand \"Rolly poly\" rolling table. It can and will move."
anchored = FALSE
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
canSmoothWith = list()
icon = 'icons/obj/smooth_structures/rollingtable.dmi'
icon_state = "rollingtable"
@@ -521,7 +521,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "optable"
buildstack = /obj/item/stack/sheet/mineral/silver
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
can_buckle = 1
buckle_lying = -1
buckle_requires_restraints = 1
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b21355ae96a..9c3248dfeca 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -304,7 +304,7 @@
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
update_icon()
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH_NEIGHBORS(src)
//merges adjacent full-tile windows into one
@@ -317,7 +317,7 @@
var/ratio = obj_integrity / max_integrity
ratio = CEILING(ratio*4, 1) * 25
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
cut_overlay(crack_overlay)
@@ -590,7 +590,7 @@
max_integrity = 50
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -604,7 +604,7 @@
max_integrity = 300
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -619,7 +619,7 @@
max_integrity = 1000
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
glass_amount = 2
/obj/structure/window/plasma/reinforced/fulltile/unanchored
@@ -633,7 +633,7 @@
max_integrity = 150
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
state = RWINDOW_SECURE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -648,7 +648,7 @@
dir = FULLTILE_WINDOW_DIR
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -672,7 +672,7 @@
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 90, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
glass_type = /obj/item/stack/sheet/titaniumglass
@@ -700,7 +700,7 @@
flags_1 = PREVENT_CLICK_UNDER_1
heat_resistance = 1600
armor = list("melee" = 95, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
damage_deflection = 11 //The same as normal reinforced windows.3
@@ -722,7 +722,7 @@
max_integrity = 15
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)
glass_amount = 2
glass_type = /obj/item/stack/sheet/paperframes
@@ -808,7 +808,7 @@
/obj/structure/window/bronze/fulltile
icon_state = "clockwork_window"
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index c38944892de..5a5582931c9 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -50,7 +50,7 @@
icon = 'icons/turf/walls/sandstone_wall.dmi'
icon_state = "sandstone"
baseturfs = /turf/closed/indestructible/sandstone
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
/turf/closed/indestructible/oldshuttle/corner
icon_state = "corner"
@@ -79,12 +79,12 @@
/turf/closed/indestructible/riveted
icon = 'icons/turf/walls/riveted.dmi'
icon_state = "riveted"
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
/turf/closed/indestructible/syndicate
icon = 'icons/turf/walls/plastitanium_wall.dmi'
icon_state = "map-shuttle"
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
/turf/closed/indestructible/riveted/uranium
icon = 'icons/turf/walls/uranium_wall.dmi'
@@ -96,6 +96,11 @@
icon = 'icons/turf/walls/plastinum_wall.dmi'
icon_state = "shuttle"
+/turf/closed/indestructible/wood
+ icon = 'icons/turf/walls/wood_wall.dmi'
+ icon_state = "wood"
+ smoothing_flags = SMOOTH_TRUE
+
/turf/closed/indestructible/abductor
icon_state = "alien1"
@@ -106,7 +111,7 @@
name = "window"
icon_state = "fake_window"
opacity = 0
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
/turf/closed/indestructible/fakeglass/Initialize()
@@ -119,7 +124,7 @@
name = "window"
icon_state = "plastitanium_window"
opacity = 0
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
/turf/closed/indestructible/opsglass/Initialize()
@@ -156,7 +161,7 @@
/turf/closed/indestructible/rock/snow/ice/ore
icon = 'icons/turf/walls/icerock_wall.dmi'
icon_state = "icerock"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
pixel_x = -4
pixel_y = -4
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index ca42b480362..606c6bebe3f 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -5,7 +5,7 @@
icon = 'icons/turf/mining.dmi'
icon_state = "rock"
var/smooth_icon = 'icons/turf/smoothrocks.dmi'
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = null
baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -254,7 +254,7 @@
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
icon_state = "mountainrock"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
defer_change = TRUE
environment_type = "snow_cavern"
@@ -323,7 +323,7 @@
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
icon_state = "mountainrock"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
defer_change = TRUE
environment_type = "snow"
@@ -574,7 +574,7 @@
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/walls/rock_wall.dmi'
icon_state = "rock2"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
baseturfs = /turf/open/floor/plating/ashplanet/wateryrock
initial_gas_mix = OPENTURF_LOW_PRESSURE
@@ -587,7 +587,7 @@
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
icon_state = "mountainrock"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
baseturfs = /turf/open/floor/plating/asteroid/snow
initial_gas_mix = FROZEN_ATMOS
@@ -605,7 +605,7 @@
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
icon_state = "icerock"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
baseturfs = /turf/open/floor/plating/asteroid/snow/ice
environment_type = "snow_cavern"
diff --git a/code/game/turfs/closed/wall/material_walls.dm b/code/game/turfs/closed/wall/material_walls.dm
index 88043e82f63..16b835d5b20 100644
--- a/code/game/turfs/closed/wall/material_walls.dm
+++ b/code/game/turfs/closed/wall/material_walls.dm
@@ -4,7 +4,7 @@
icon = 'icons/turf/walls/materialwall.dmi'
icon_state = "wall"
canSmoothWith = list(/turf/closed/wall/material)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
/turf/closed/wall/material/break_wall()
diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
index ba798fcd5a6..89b04a7335d 100644
--- a/code/game/turfs/closed/wall/mineral_walls.dm
+++ b/code/game/turfs/closed/wall/mineral_walls.dm
@@ -5,7 +5,7 @@
var/last_event = 0
var/active = null
canSmoothWith = null
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
/turf/closed/wall/mineral/gold
name = "gold wall"
@@ -187,7 +187,7 @@
desc = "A wall with alien alloy plating."
icon = 'icons/turf/walls/abductor_wall.dmi'
icon_state = "abductor"
- smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
+ smoothing_flags = SMOOTH_TRUE|SMOOTH_DIAGONAL
sheet_type = /obj/item/stack/sheet/mineral/abductor
slicing_duration = 200 //alien wall takes twice as much time to slice
explosion_block = 3
@@ -204,20 +204,20 @@
flags_1 = CAN_BE_DIRTY_1
flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
sheet_type = /obj/item/stack/sheet/mineral/titanium
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+ smoothing_flags = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
/turf/closed/wall/mineral/titanium/rust_heretic_act()
return // titanium does not rust
/turf/closed/wall/mineral/titanium/nodiagonal
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
icon_state = "map-shuttle_nd"
/turf/closed/wall/mineral/titanium/nosmooth
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/closed/wall/mineral/titanium/overspace
icon_state = "map-overspace"
@@ -251,11 +251,11 @@
desc = "An easily-compressable wall used for temporary shelter."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "smooth"
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+ smoothing_flags = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
/turf/closed/wall/mineral/titanium/survival/nodiagonal
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
/turf/closed/wall/mineral/titanium/survival/pod
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
@@ -269,20 +269,20 @@
icon_state = "map-shuttle"
explosion_block = 4
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+ smoothing_flags = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plasma/reinforced/plastitanium, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
/turf/closed/wall/mineral/plastitanium/rust_heretic_act()
return // plastitanium does not rust
/turf/closed/wall/mineral/plastitanium/nodiagonal
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
icon_state = "map-shuttle_nd"
/turf/closed/wall/mineral/plastitanium/nosmooth
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/closed/wall/mineral/plastitanium/overspace
icon_state = "map-overspace"
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index ecc57ab2a2c..af95e6c0a5f 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -4,7 +4,7 @@
icon = 'icons/turf/walls/cult_wall.dmi'
icon_state = "cult"
canSmoothWith = null
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
sheet_type = /obj/item/stack/sheet/runed_metal
sheet_amount = 1
girder_type = /obj/structure/girder/cult
diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm
index c702f6a2f7f..fa3dd40b953 100644
--- a/code/game/turfs/closed/wall/reinf_walls.dm
+++ b/code/game/turfs/closed/wall/reinf_walls.dm
@@ -196,10 +196,10 @@
/turf/closed/wall/r_wall/update_icon()
. = ..()
if(d_state != INTACT)
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
clear_smooth_overlays()
else
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
@@ -235,20 +235,20 @@
icon_state = "map-shuttle"
explosion_block = 20
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+ smoothing_flags = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/r_wall/syndicate, /turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plasma/reinforced/plastitanium, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
/turf/closed/wall/r_wall/syndicate/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
return FALSE
/turf/closed/wall/r_wall/syndicate/nodiagonal
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
icon_state = "map-shuttle_nd"
/turf/closed/wall/r_wall/syndicate/nosmooth
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/closed/wall/r_wall/syndicate/overspace
icon_state = "map-overspace"
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index 1d91f12942f..3b1daea7ee6 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -28,7 +28,7 @@
/obj/structure/falsewall/reinforced,
/turf/closed/wall/rust,
/turf/closed/wall/r_wall/rust)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
var/list/dent_decals
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index eada9138ebd..f68cee68ad8 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -110,7 +110,7 @@
icon = 'icons/turf/floors/hierophant_floor.dmi'
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
baseturfs = /turf/open/indestructible/hierophant
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
tiled_dirt = FALSE
/turf/open/indestructible/hierophant/two
diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm
index 24421b9bbce..a5876adbac9 100644
--- a/code/game/turfs/open/chasm.dm
+++ b/code/game/turfs/open/chasm.dm
@@ -3,7 +3,7 @@
name = "chasm"
desc = "Watch your step."
baseturfs = /turf/open/chasm
- smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
+ smoothing_flags = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
icon = 'icons/turf/floors/chasms.dmi'
icon_state = "smooth"
canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 0d309ef8437..cebe62b2c76 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -177,7 +177,7 @@
icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/turf/open/floor/carpet, /turf/open/floor/carpet/airless)
flags_1 = NONE
bullet_bounce_sound = null
@@ -199,11 +199,11 @@
if(!..())
return 0
if(!broken && !burnt)
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
else
make_plating()
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH_NEIGHBORS(src)
/turf/open/floor/carpet/black
@@ -305,7 +305,7 @@
/turf/open/floor/fakepit
desc = "A clever illusion designed to look like a bottomless pit."
- smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
+ smoothing_flags = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
canSmoothWith = list(/turf/open/floor/fakepit)
icon = 'icons/turf/floors/Chasms.dmi'
icon_state = "smooth"
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index f210bcc9fca..f394f047bcb 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -47,7 +47,7 @@
gender = PLURAL
name = "ash"
icon_state = "ash"
- smooth = SMOOTH_MORE|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE|SMOOTH_BORDER
var/smooth_icon = 'icons/turf/floors/ash.dmi'
desc = "The ground is covered in volcanic ash."
baseturfs = /turf/open/floor/plating/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface
@@ -61,7 +61,7 @@
tiled_dirt = FALSE
/turf/open/floor/plating/ashplanet/Initialize()
- if(smooth)
+ if(smoothing_flags)
var/matrix/M = new
M.Translate(-4, -4)
transform = M
@@ -97,7 +97,7 @@
/turf/open/floor/plating/ashplanet/wateryrock
gender = PLURAL
name = "wet rocky ground"
- smooth = null
+ smoothing_flags = NONE
icon_state = "wateryrock"
slowdown = 2
footstep = FOOTSTEP_FLOOR
@@ -209,7 +209,7 @@
/turf/open/floor/plating/ice/smooth
icon_state = "smooth"
- smooth = SMOOTH_MORE | SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice, /turf/open/floor/plating/ice/colder)
/turf/open/floor/plating/ice/colder
@@ -249,7 +249,7 @@
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
/turf/open/floor/plating/snowed/smoothed
- smooth = SMOOTH_MORE | SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/plating/snowed/smoothed, /turf/open/floor/plating/snowed)
planetary_atmos = TRUE
icon = 'icons/turf/floors/snow_turf.dmi'
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index ae4ed0d5044..1f0bdc206b9 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -182,7 +182,7 @@
baseturfs = /turf/open/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
icon_state = "unsmooth"
- smooth = SMOOTH_MORE | SMOOTH_BORDER
+ smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/lava/smooth)
/turf/open/lava/smooth/lava_land_surface
diff --git a/code/game/turfs/open/transparent.dm b/code/game/turfs/open/transparent.dm
index 334b42e9354..c15d5ad7bc6 100644
--- a/code/game/turfs/open/transparent.dm
+++ b/code/game/turfs/open/transparent.dm
@@ -56,7 +56,7 @@
desc = "Dont jump on it, or do, I'm not your mom."
icon = 'icons/turf/floors/glass.dmi'
icon_state = "floor_glass"
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/open/transparent/glass, /turf/open/transparent/glass/reinforced)
footstep = FOOTSTEP_PLATING
barefootstep = FOOTSTEP_HARD_BAREFOOT
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 3936ebee632..b8a411aebc6 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
assemble_baseturfs()
levelupdate()
- if(smooth)
+ if(smoothing_flags)
QUEUE_SMOOTH(src)
visibilityChanged()
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 9e76c258f91..5305642e847 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -105,7 +105,7 @@
icon = 'icons/turf/floors/carpet.dmi'
icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
bullet_bounce_sound = null
tiled_dirt = FALSE
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 1c397ef983e..15b24cc0f07 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -87,7 +87,7 @@
name = "pod window"
icon = 'icons/obj/smooth_structures/pod_window.dmi'
icon_state = "smooth"
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
/obj/structure/window/shuttle/survival_pod/spawner/north
@@ -133,7 +133,7 @@
/obj/structure/table/survival_pod
icon = 'icons/obj/lavaland/survival_pod.dmi'
icon_state = "table"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
//Sleeper
/obj/machinery/sleeper/survival_pod
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index a33b8ad9f2c..2d5542c6887 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -519,7 +519,7 @@ Difficulty: Hard
icon_state = "wall"
light_range = MINIMUM_USEFUL_LIGHT_RANGE
duration = 100
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
/obj/effect/temp_visual/hierophant/wall/Initialize(mapload, new_caster)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index dacab32fc28..a5249905cdd 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -304,7 +304,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
icon_state = "wall"
duration = 50
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_TRUE
layer = BELOW_MOB_LAYER
color = rgb(255,0,0)
light_range = MINIMUM_USEFUL_LIGHT_RANGE
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index 51d807e713a..37af7f4139c 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -16,7 +16,7 @@
layer = SPACEVINE_MOB_LAYER
opacity = 0
canSmoothWith = list()
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/// The amount of time it takes to create a venus human trap, in deciseconds
var/growth_time = 1200
@@ -37,7 +37,7 @@
* Spawns a venus human trap, then qdels itself.
*
* Displays a message, spawns a human venus trap, then qdels itself.
- */
+ */
/obj/structure/alien/resin/flower_bud_enemy/proc/bear_fruit()
visible_message("The plant has borne fruit!")
new /mob/living/simple_animal/hostile/venus_human_trap(get_turf(src))
@@ -103,7 +103,7 @@
/mob/living/simple_animal/hostile/venus_human_trap/Life()
. = ..()
pull_vines()
-
+
/mob/living/simple_animal/hostile/venus_human_trap/AttackingTarget()
. = ..()
if(isliving(target))
@@ -125,7 +125,7 @@
for(var/obj/O in T)
if(O.density)
return
-
+
var/datum/beam/newVine = Beam(the_target, "vine", time=INFINITY, maxdistance = vine_grab_distance, beam_type=/obj/effect/ebeam/vine)
RegisterSignal(newVine, COMSIG_PARENT_QDELETING, .proc/remove_vine, newVine)
vines += newVine
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index b884a2b0e75..fbdfd91dbf2 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -12,7 +12,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
setDir(angle2dir(rotation+dir2angle(dir)))
//resmooth if need be.
- if(smooth && (params & ROTATE_SMOOTH))
+ if(smoothing_flags && (params & ROTATE_SMOOTH))
QUEUE_SMOOTH(src)
//rotate the pixel offsets too.