From ac6f9b4725b4471d3e5ca23d04bce24cd01a1a9e Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:04:24 +0000
Subject: [PATCH] [IDB Ignore] Refactor icon smoothing to use 8-bit bitmasking
(#16620)
---
_maps/map_files/generic/centcomm.dmm | 269 ++-------
code/__DEFINES/bitfields.dm | 4 +
code/__DEFINES/icon_smoothing.dm | 126 ++++
code/__DEFINES/layers.dm | 1 +
code/__HELPERS/bitflag_lists.dm | 25 +
code/__HELPERS/icon_smoothing.dm | 546 +++++++++++-------
code/__HELPERS/string_assoc_lists.dm | 17 +
code/_globalvars/bitfields.dm | 6 +
code/controllers/subsystem/icon_smooth.dm | 24 +-
code/game/area/areas.dm | 2 +
code/game/atoms.dm | 28 +
.../miniantags/abduction/abduction_gear.dm | 6 +-
.../machinery/computer/HolodeckControl.dm | 50 +-
code/game/machinery/cryopod.dm | 2 +-
code/game/machinery/deployable.dm | 8 +-
code/game/machinery/doors/airlock.dm | 1 +
code/game/objects/buckling.dm | 1 +
.../objects/effects/decals/Cleanable/misc.dm | 18 +-
code/game/objects/effects/decals/cleanable.dm | 10 +-
code/game/objects/items/weapons/defib.dm | 4 +-
code/game/objects/structures.dm | 13 +-
code/game/objects/structures/aliens.dm | 74 +--
code/game/objects/structures/false_walls.dm | 159 +++--
code/game/objects/structures/lattice.dm | 26 +-
.../stool_bed_chair_nest/alien_nests.dm | 6 +-
code/game/objects/structures/tables_racks.dm | 102 ++--
code/game/objects/structures/window.dm | 60 +-
code/game/turfs/simulated.dm | 2 +-
code/game/turfs/simulated/floor/chasm.dm | 8 +-
.../game/turfs/simulated/floor/fancy_floor.dm | 86 ++-
.../turfs/simulated/floor/indestructible.dm | 2 +-
code/game/turfs/simulated/floor/lava.dm | 8 +-
code/game/turfs/simulated/floor/misc_floor.dm | 4 +-
code/game/turfs/simulated/floor/plating.dm | 11 +-
.../game/turfs/simulated/floor/transparent.dm | 21 +-
code/game/turfs/simulated/minerals.dm | 27 +-
code/game/turfs/simulated/walls.dm | 30 +-
.../turfs/simulated/walls_indestructible.dm | 68 ++-
code/game/turfs/simulated/walls_mineral.dm | 128 ++--
code/game/turfs/simulated/walls_misc.dm | 15 +-
code/game/turfs/simulated/walls_reinforced.dm | 15 +-
code/game/turfs/space/space.dm | 10 +
code/game/turfs/turf.dm | 15 +-
.../awaymissions/mission_code/beach.dm | 20 +-
code/modules/awaymissions/zlevel.dm | 8 +-
code/modules/mining/equipment/survival_pod.dm | 12 +-
.../hostile/megafauna/bubblegum.dm | 2 +-
.../hostile/megafauna/hierophant.dm | 15 +-
.../hostile/megafauna/swarmer.dm | 3 +-
.../simple_animal/hostile/venus_human_trap.dm | 8 +-
code/modules/power/supermatter/supermatter.dm | 2 +-
code/modules/recycling/disposal.dm | 2 +-
.../ruins/lavalandruin_code/dead_ratvar.dm | 10 +-
code/modules/shuttle/on_move.dm | 4 +-
code/modules/shuttle/ripple.dm | 8 +-
code/modules/shuttle/shuttle_rotate.dm | 4 +-
icons/effects/dirt.dmi | Bin 6011 -> 9826 bytes
icons/effects/effects.dmi | Bin 393538 -> 393850 bytes
icons/mob/alien.dmi | Bin 100722 -> 79587 bytes
icons/obj/smooth_structures/alien/nest.dmi | Bin 30888 -> 3026 bytes
.../alien/resin_membrane.dmi | Bin 42660 -> 16949 bytes
.../smooth_structures/alien/resin_wall.dmi | Bin 36679 -> 3764 bytes
.../obj/smooth_structures/alien/weednode.dmi | Bin 0 -> 3356 bytes
icons/obj/smooth_structures/alien/weeds1.dmi | Bin 0 -> 2551 bytes
icons/obj/smooth_structures/alien/weeds2.dmi | Bin 0 -> 2554 bytes
icons/obj/smooth_structures/alien/weeds3.dmi | Bin 0 -> 2561 bytes
icons/obj/smooth_structures/alien_table.dmi | Bin 10191 -> 3057 bytes
icons/obj/smooth_structures/brass_table.dmi | Bin 882 -> 1894 bytes
icons/obj/smooth_structures/catwalk.dmi | Bin 2149 -> 3692 bytes
.../smooth_structures/clockwork_window.dmi | Bin 3555 -> 5101 bytes
icons/obj/smooth_structures/fancy_table.dmi | Bin 1301 -> 7185 bytes
.../smooth_structures/fancy_table_black.dmi | Bin 1307 -> 6785 bytes
.../smooth_structures/fancy_table_blue.dmi | Bin 3400 -> 7259 bytes
.../smooth_structures/fancy_table_cyan.dmi | Bin 3545 -> 7550 bytes
.../smooth_structures/fancy_table_green.dmi | Bin 3266 -> 7049 bytes
.../smooth_structures/fancy_table_orange.dmi | Bin 3208 -> 7323 bytes
.../smooth_structures/fancy_table_purple.dmi | Bin 3185 -> 7120 bytes
.../obj/smooth_structures/fancy_table_red.dmi | Bin 3195 -> 6945 bytes
.../fancy_table_royalblack.dmi | Bin 3252 -> 6677 bytes
.../fancy_table_royalblue.dmi | Bin 3296 -> 7258 bytes
icons/obj/smooth_structures/glass_table.dmi | Bin 3983 -> 5293 bytes
icons/obj/smooth_structures/lattice.dmi | Bin 1104 -> 2113 bytes
icons/obj/smooth_structures/plasma_window.dmi | Bin 6382 -> 12129 bytes
.../smooth_structures/plastitanium_window.dmi | Bin 2401 -> 4581 bytes
icons/obj/smooth_structures/pod_window.dmi | Bin 3798 -> 6539 bytes
icons/obj/smooth_structures/poker_table.dmi | Bin 5597 -> 8360 bytes
.../smooth_structures/reinforced_table.dmi | Bin 6398 -> 1733 bytes
.../smooth_structures/reinforced_window.dmi | Bin 9125 -> 13410 bytes
icons/obj/smooth_structures/rice_window.dmi | Bin 9483 -> 27321 bytes
.../obj/smooth_structures/rplasma_window.dmi | Bin 9442 -> 16758 bytes
icons/obj/smooth_structures/sandbags.dmi | Bin 993 -> 2201 bytes
.../obj/smooth_structures/shuttle_window.dmi | Bin 2922 -> 7255 bytes
.../obj/smooth_structures/swarmer_catwalk.dmi | Bin 2491 -> 3981 bytes
icons/obj/smooth_structures/table.dmi | Bin 5619 -> 5385 bytes
.../obj/smooth_structures/table_greyscale.dmi | Bin 0 -> 1465 bytes
icons/obj/smooth_structures/tinted_window.dmi | Bin 7294 -> 12662 bytes
icons/obj/smooth_structures/window.dmi | Bin 5080 -> 7919 bytes
icons/obj/smooth_structures/wood_table.dmi | Bin 2119 -> 4230 bytes
icons/turf/floors.dmi | Bin 422072 -> 403824 bytes
icons/turf/floors/Chasms.dmi | Bin 12342 -> 3329 bytes
icons/turf/floors/ash.dmi | Bin 50999 -> 3817 bytes
icons/turf/floors/carpet.dmi | Bin 2982 -> 5477 bytes
icons/turf/floors/carpet_black.dmi | Bin 1699 -> 2680 bytes
icons/turf/floors/carpet_blue.dmi | Bin 6963 -> 11913 bytes
icons/turf/floors/carpet_cyan.dmi | Bin 2534 -> 4505 bytes
icons/turf/floors/carpet_green.dmi | Bin 7961 -> 15352 bytes
icons/turf/floors/carpet_orange.dmi | Bin 7422 -> 14175 bytes
icons/turf/floors/carpet_purple.dmi | Bin 6455 -> 9795 bytes
icons/turf/floors/carpet_red.dmi | Bin 7491 -> 12562 bytes
icons/turf/floors/carpet_royalblack.dmi | Bin 6711 -> 10064 bytes
icons/turf/floors/carpet_royalblue.dmi | Bin 3369 -> 5543 bytes
icons/turf/floors/glass.dmi | Bin 2316 -> 3910 bytes
icons/turf/floors/grass.dmi | Bin 0 -> 4942 bytes
icons/turf/floors/ice_turf.dmi | Bin 0 -> 4712 bytes
icons/turf/floors/ice_turfs.dmi | Bin 3120 -> 0 bytes
icons/turf/floors/junglegrass.dmi | Bin 0 -> 4987 bytes
icons/turf/floors/lava.dmi | Bin 37791 -> 9697 bytes
icons/turf/floors/plasmaglass.dmi | Bin 1514 -> 3260 bytes
icons/turf/floors/plastitaniumglass.dmi | Bin 1336 -> 4522 bytes
icons/turf/floors/reinf_glass.dmi | Bin 3885 -> 6733 bytes
icons/turf/floors/reinf_plasmaglass.dmi | Bin 2677 -> 7904 bytes
icons/turf/floors/ripple.dmi | Bin 7575 -> 10921 bytes
icons/turf/floors/rocky_ash.dmi | Bin 0 -> 3881 bytes
icons/turf/floors/seadrop-o.dmi | Bin 4317 -> 6150 bytes
icons/turf/floors/seadrop.dmi | Bin 74279 -> 76239 bytes
icons/turf/floors/snow_turf.dmi | Bin 0 -> 5159 bytes
icons/turf/floors/titaniumglass.dmi | Bin 1279 -> 4170 bytes
icons/turf/smoothrocks.dmi | Bin 4949 -> 3876 bytes
icons/turf/walls/abductor_wall.dmi | Bin 19171 -> 4519 bytes
icons/turf/walls/bananium_wall.dmi | Bin 6526 -> 2613 bytes
icons/turf/walls/boss_wall.dmi | Bin 2444 -> 4611 bytes
icons/turf/walls/clockwork_wall.dmi | Bin 2773 -> 3276 bytes
icons/turf/walls/coated_reinforced_wall.dmi | Bin 16342 -> 0 bytes
icons/turf/walls/cult_wall.dmi | Bin 17796 -> 2279 bytes
icons/turf/walls/diamond_wall.dmi | Bin 6794 -> 2552 bytes
icons/turf/walls/gold_wall.dmi | Bin 6696 -> 2568 bytes
icons/turf/walls/hierophant_wall.dmi | Bin 5351 -> 5347 bytes
icons/turf/walls/hierophant_wall_temp.dmi | Bin 1715 -> 3547 bytes
icons/turf/walls/icedmetal_wall.dmi | Bin 16043 -> 3680 bytes
icons/turf/walls/icerock_wall.dmi | Bin 0 -> 2451 bytes
icons/turf/walls/iron_wall.dmi | Bin 6260 -> 2568 bytes
icons/turf/walls/materialwall.dmi | Bin 0 -> 960 bytes
icons/turf/walls/mountain_wall.dmi | Bin 0 -> 2532 bytes
icons/turf/walls/plasma_wall.dmi | Bin 52639 -> 8763 bytes
icons/turf/walls/plastinum_wall.dmi | Bin 0 -> 4393 bytes
icons/turf/walls/plastitanium_wall.dmi | Bin 15114 -> 5728 bytes
icons/turf/walls/red_wall.dmi | Bin 0 -> 3787 bytes
icons/turf/walls/reinforced_rock.dmi | Bin 0 -> 5077 bytes
icons/turf/walls/reinforced_wall.dmi | Bin 15072 -> 15211 bytes
icons/turf/walls/riveted.dmi | Bin 0 -> 2339 bytes
icons/turf/walls/rock_wall.dmi | Bin 1727 -> 2443 bytes
icons/turf/walls/rusty_reinforced_wall.dmi | Bin 51812 -> 34674 bytes
icons/turf/walls/rusty_wall.dmi | Bin 43386 -> 24047 bytes
icons/turf/walls/sandstone_wall.dmi | Bin 6661 -> 2576 bytes
icons/turf/walls/shuttle_wall.dmi | Bin 12280 -> 0 bytes
icons/turf/walls/silver_wall.dmi | Bin 6440 -> 2570 bytes
icons/turf/walls/snow_wall.dmi | Bin 5594 -> 2465 bytes
icons/turf/walls/survival_pod_walls.dmi | Bin 24320 -> 6024 bytes
icons/turf/walls/uranium_wall.dmi | Bin 54763 -> 38601 bytes
icons/turf/walls/wall.dmi | Bin 6515 -> 2871 bytes
icons/turf/walls/wood_wall.dmi | Bin 6170 -> 2666 bytes
paradise.dme | 5 +
162 files changed, 1271 insertions(+), 870 deletions(-)
create mode 100644 code/__DEFINES/bitfields.dm
create mode 100644 code/__DEFINES/icon_smoothing.dm
create mode 100644 code/__HELPERS/bitflag_lists.dm
create mode 100644 code/__HELPERS/string_assoc_lists.dm
create mode 100644 code/_globalvars/bitfields.dm
create mode 100644 icons/obj/smooth_structures/alien/weednode.dmi
create mode 100644 icons/obj/smooth_structures/alien/weeds1.dmi
create mode 100644 icons/obj/smooth_structures/alien/weeds2.dmi
create mode 100644 icons/obj/smooth_structures/alien/weeds3.dmi
create mode 100644 icons/obj/smooth_structures/table_greyscale.dmi
create mode 100644 icons/turf/floors/grass.dmi
create mode 100644 icons/turf/floors/ice_turf.dmi
delete mode 100644 icons/turf/floors/ice_turfs.dmi
create mode 100644 icons/turf/floors/junglegrass.dmi
create mode 100644 icons/turf/floors/rocky_ash.dmi
create mode 100644 icons/turf/floors/snow_turf.dmi
delete mode 100644 icons/turf/walls/coated_reinforced_wall.dmi
create mode 100644 icons/turf/walls/icerock_wall.dmi
create mode 100644 icons/turf/walls/materialwall.dmi
create mode 100644 icons/turf/walls/mountain_wall.dmi
create mode 100644 icons/turf/walls/plastinum_wall.dmi
create mode 100644 icons/turf/walls/red_wall.dmi
create mode 100644 icons/turf/walls/reinforced_rock.dmi
create mode 100644 icons/turf/walls/riveted.dmi
delete mode 100644 icons/turf/walls/shuttle_wall.dmi
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index f5bd0b3109f..da795627767 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -60,7 +60,9 @@
/turf/simulated/wall/indestructible/riveted,
/area/space)
"ao" = (
-/obj/structure/chair/stool/holostool,
+/obj/structure/chair/stool/holostool{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/holofloor{
icon_state = "asteroid"
@@ -157,13 +159,6 @@
/obj/structure/flora/ausbushes/grassybush,
/turf/simulated/floor/holofloor/grass,
/area/holodeck/source_picnicarea)
-"aH" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet7-3"
- },
-/area/holodeck/source_theatre)
"aI" = (
/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/plasteel/dark/nitrogen,
@@ -183,13 +178,6 @@
icon_state = "asteroid"
},
/area/holodeck/source_desert)
-"aM" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet15-15"
- },
-/area/holodeck/source_theatre)
"aN" = (
/turf/space,
/area/space)
@@ -226,20 +214,6 @@
icon_state = "red"
},
/area/holodeck/source_emptycourt)
-"aS" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet11-12"
- },
-/area/holodeck/source_theatre)
-"aV" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet5-1"
- },
-/area/holodeck/source_theatre)
"aW" = (
/turf/simulated/floor/holofloor{
dir = 5;
@@ -259,19 +233,11 @@
icon_state = "asteroid"
},
/area/holodeck/source_picnicarea)
-"aZ" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet13-5"
- },
-/area/holodeck/source_theatre)
"ba" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet9-4"
+/obj/structure/chair/stool/holostool{
+ dir = 1
},
+/turf/simulated/floor/holofloor/carpet,
/area/holodeck/source_theatre)
"bb" = (
/obj/structure/table/holotable/wood,
@@ -279,13 +245,6 @@
icon_state = "grimy"
},
/area/holodeck/source_meetinghall)
-"bc" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet6-0"
- },
-/area/holodeck/source_meetinghall)
"bd" = (
/turf/simulated/floor/holofloor{
icon = 'icons/turf/floors/plating.dmi';
@@ -296,20 +255,6 @@
/obj/machinery/computer/shuttle/ert,
/turf/simulated/floor/plasteel/grimy,
/area/centcom/specops)
-"bf" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet14-0"
- },
-/area/holodeck/source_meetinghall)
-"bg" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet10-0"
- },
-/area/holodeck/source_meetinghall)
"bh" = (
/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel/dark/nitrogen,
@@ -318,13 +263,6 @@
/obj/structure/table/wood,
/turf/simulated/floor/plasteel/dark/nitrogen,
/area/vox_station)
-"bj" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet7-0"
- },
-/area/holodeck/source_meetinghall)
"bk" = (
/obj/machinery/door/airlock/centcom{
opacity = 1
@@ -334,52 +272,12 @@
"bl" = (
/turf/simulated/floor/plating/nitrogen,
/area/vox_station)
-"bm" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet15-0"
- },
-/area/holodeck/source_meetinghall)
-"bn" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet6-2"
- },
-/area/holodeck/source_theatre)
"bo" = (
/turf/simulated/floor/holofloor{
dir = 4;
icon_state = "wood"
},
/area/holodeck/source_theatre)
-"bp" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet11-0"
- },
-/area/holodeck/source_meetinghall)
-"bq" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet14-10"
- },
-/area/holodeck/source_theatre)
-"br" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet5-0"
- },
-/area/holodeck/source_meetinghall)
-"bs" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet13-0"
- },
-/area/holodeck/source_meetinghall)
"bt" = (
/obj/structure/flora/ausbushes/fullgrass,
/turf/simulated/floor/holofloor/grass,
@@ -391,11 +289,10 @@
},
/area/holodeck/source_emptycourt)
"bv" = (
-/obj/structure/chair/stool/holostool,
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet9-0"
+/obj/structure/chair/stool/holostool{
+ dir = 1
},
+/turf/simulated/floor/holofloor/carpet,
/area/holodeck/source_meetinghall)
"bz" = (
/obj/machinery/porta_turret/syndicate{
@@ -627,12 +524,6 @@
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
-"cD" = (
-/turf/simulated/floor/holofloor{
- dir = 6;
- icon_state = "carpetsymbol"
- },
-/area/holodeck/source_meetinghall)
"cE" = (
/turf/simulated/floor/holofloor{
dir = 8;
@@ -4990,10 +4881,8 @@
aiControlDisabled = 1;
frequency = 1379;
hackProof = 1;
- icon_state = "door_locked";
id_tag = "emergency_away";
- name = "Arrival Airlock";
- req_access = null
+ name = "Arrival Airlock"
},
/turf/simulated/floor/plating,
/area/centcom/evac)
@@ -8744,24 +8633,12 @@
},
/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate)
-"Ew" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet2-0"
- },
-/area/holodeck/source_theatre)
"Ex" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "burst_r"
},
/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
-"Ez" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet8-0"
- },
-/area/holodeck/source_meetinghall)
"EA" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/soda,
@@ -8965,13 +8842,6 @@
/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
-"Fn" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"Fo" = (
/obj/structure/closet/crate/internals,
/obj/item/tank/internals/oxygen/red,
@@ -9576,12 +9446,6 @@
"IS" = (
/turf/simulated/floor/plasteel,
/area/tdome/tdomeadmin)
-"IU" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet10-8"
- },
-/area/holodeck/source_theatre)
"IV" = (
/obj/machinery/vending/cigarette,
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10010,12 +9874,6 @@
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
-"LG" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet1-0"
- },
-/area/holodeck/source_theatre)
"LH" = (
/obj/structure/table/reinforced,
/obj/item/storage/backpack/medic,
@@ -10287,7 +10145,7 @@
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
/obj/structure/window/full/shuttle,
-/turf/simulated/floor/grass,
+/turf/simulated/floor/grass/no_creep,
/area/shuttle/escape)
"Ny" = (
/obj/machinery/optable,
@@ -11315,7 +11173,7 @@
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/window/full/shuttle,
-/turf/simulated/floor/grass,
+/turf/simulated/floor/grass/no_creep,
/area/shuttle/escape)
"TU" = (
/obj/machinery/ai_status_display,
@@ -11459,10 +11317,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"UK" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet3-0"
- },
+/turf/simulated/floor/holofloor/carpet,
/area/holodeck/source_theatre)
"UM" = (
/obj/structure/flora/grass/brown,
@@ -11498,6 +11353,15 @@
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
+"Vb" = (
+/obj/structure/chair/stool/holostool{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/holofloor{
+ icon_state = "asteroid"
+ },
+/area/holodeck/source_picnicarea)
"Vc" = (
/obj/structure/closet/crate/medical,
/obj/item/reagent_containers/glass/bottle/morphine,
@@ -11987,10 +11851,7 @@
/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"XT" = (
-/turf/simulated/floor/holofloor{
- dir = 4;
- icon_state = "carpet4-0"
- },
+/turf/simulated/floor/holofloor/carpet,
/area/holodeck/source_meetinghall)
"XW" = (
/turf/simulated/floor/plating,
@@ -12288,9 +12149,7 @@
/area/holodeck/source_emptycourt)
"ZV" = (
/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "14"
- },
+/obj/structure/window/full/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
"ZZ" = (
@@ -44080,7 +43939,7 @@ Ef
cP
Jx
PX
-Fn
+ZV
TY
DW
aN
@@ -69358,8 +69217,8 @@ Rj
bH
QT
aY
-ao
-ao
+Vb
+Vb
aY
QT
bH
@@ -70131,10 +69990,10 @@ aO
bo
bo
bo
-Ew
UK
UK
-LG
+UK
+UK
cd
cm
cm
@@ -70386,22 +70245,22 @@ al
aO
aO
bo
-bn
-aH
-aH
-aH
-aH
-aV
+UK
+ba
+ba
+ba
+ba
+ba
cd
cm
XT
bb
cm
-bc
-bj
-bj
-bj
-br
+bv
+bv
+bv
+bv
+bv
cm
cc
aN
@@ -70643,22 +70502,22 @@ al
aO
aO
bo
-bq
-aM
-aM
-aM
-aM
-aZ
+UK
+ba
+ba
+ba
+ba
+ba
cd
cm
-cD
+XT
bb
cm
-bf
-bm
-bm
-bm
-bs
+bv
+bv
+bv
+bv
+bv
cm
cc
aN
@@ -70900,21 +70759,21 @@ al
aO
aO
bo
-IU
-aS
-aS
-aS
-aS
+UK
+ba
+ba
+ba
+ba
ba
cd
cm
-Ez
+XT
bb
cm
-bg
-bp
-bp
-bp
+bv
+bv
+bv
+bv
bv
cm
cc
@@ -71159,10 +71018,10 @@ aO
Hp
bo
bo
-Ew
UK
UK
-LG
+UK
+UK
cd
cm
cm
diff --git a/code/__DEFINES/bitfields.dm b/code/__DEFINES/bitfields.dm
new file mode 100644
index 00000000000..19a962fbffe
--- /dev/null
+++ b/code/__DEFINES/bitfields.dm
@@ -0,0 +1,4 @@
+#define DEFINE_BITFIELD(_variable, _flags) /datum/bitfield/##_variable { \
+ flags = ##_flags; \
+ variable = #_variable; \
+}
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
new file mode 100644
index 00000000000..63b63d92387
--- /dev/null
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -0,0 +1,126 @@
+/* smoothing_flags */
+/// Smoothing system in where adjacencies are calculated and used to build an image by mounting each corner at runtime.
+#define SMOOTH_CORNERS (1<<0)
+/// Smoothing system in where adjacencies are calculated and used to select a pre-baked icon_state, encoded by bitmasking.
+#define SMOOTH_BITMASK (1<<1)
+/// Atom has diagonal corners, with underlays under them.
+#define SMOOTH_DIAGONAL_CORNERS (1<<2)
+/// Atom will smooth with the borders of the map.
+#define SMOOTH_BORDER (1<<3)
+/// Atom is currently queued to smooth.
+#define SMOOTH_QUEUED (1<<4)
+/// Smooths with objects, and will thus need to scan turfs for contents.
+#define SMOOTH_OBJ (1<<5)
+
+DEFINE_BITFIELD(smoothing_flags, list(
+ "SMOOTH_CORNERS" = SMOOTH_CORNERS,
+ "SMOOTH_BITMASK" = SMOOTH_BITMASK,
+ "SMOOTH_DIAGONAL_CORNERS" = SMOOTH_DIAGONAL_CORNERS,
+ "SMOOTH_BORDER" = SMOOTH_BORDER,
+ "SMOOTH_QUEUED" = SMOOTH_QUEUED,
+ "SMOOTH_OBJ" = SMOOTH_OBJ,
+))
+
+/*smoothing macros*/
+
+#define QUEUE_SMOOTH(thing_to_queue) if(thing_to_queue.smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) {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)}
+
+/**SMOOTHING GROUPS
+ * Groups of things to smooth with.
+ * * Contained in the `list/smoothing_groups` variable.
+ * * Matched with the `list/canSmoothWith` variable to check whether smoothing is possible or not.
+ */
+
+#define S_TURF(num) ((24 * 0) + num) //Not any different from the number itself, but kept this way in case someone wants to expand it by adding stuff before it.
+/* /turf only */
+
+#define SMOOTH_GROUP_TURF S_TURF(0) ///turf/simulated
+#define SMOOTH_GROUP_TURF_CHASM S_TURF(1) ///turf/simulated/chasm, /turf/simulated/floor/fakepit
+#define SMOOTH_GROUP_FLOOR_LAVA S_TURF(2) ///turf/simulated/lava/smooth
+#define SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS S_TURF(3) ///turf/simulated/transparent/glass
+
+#define SMOOTH_GROUP_FLOOR S_TURF(4) ///turf/simulated/floor
+
+#define SMOOTH_GROUP_FLOOR_GRASS S_TURF(5) ///turf/simulated/floor/plating/grass
+#define SMOOTH_GROUP_FLOOR_ICE S_TURF(6) ///turf/simulated/floor/plating/ice
+#define SMOOTH_GROUP_BEACH_WATER S_TURF(7) ///turf/simulated/floor/beach/away/water/
+#define SMOOTH_GROUP_GLASS_FLOOR S_TURF(8) ///turf/simulated/floor/transparent/glass and subtypes
+#define SMOOTH_GROUP_GLASS_FLOOR_TITANIUM S_TURF(9) ///turf/simulated/floor/transparent/glass/titanium and subtypes
+
+#define SMOOTH_GROUP_CARPET S_TURF(10) ///turf/simulated/floor/carpet
+#define SMOOTH_GROUP_CARPET_BLACK S_TURF(11)
+#define SMOOTH_GROUP_CARPET_BLUE S_TURF(12)
+#define SMOOTH_GROUP_CARPET_CYAN S_TURF(13)
+#define SMOOTH_GROUP_CARPET_GREEN S_TURF(14)
+#define SMOOTH_GROUP_CARPET_ROYALBLACK S_TURF(15)
+#define SMOOTH_GROUP_CARPET_ROYALBLUE S_TURF(17)
+#define SMOOTH_GROUP_CARPET_RED S_TURF(17)
+#define SMOOTH_GROUP_CARPET_ORANGE S_TURF(18)
+#define SMOOTH_GROUP_CARPET_PURPLE S_TURF(19)
+
+#define SMOOTH_GROUP_SIMULATED_TURFS S_TURF(24) ///turf/simulated
+#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(25) ///turf/simulated/wall/material
+#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(26) ///turf/simulated/wall/r_wall/syndicate, /turf/simulated/indestructible/syndicate
+#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(27) ///turf/simulated/indestructible/hotelwall
+#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(28) ///turf/simulated/mineral, /turf/simulated/indestructible
+#define SMOOTH_GROUP_BOSS_WALLS S_TURF(29) ///turf/simulated/indestructible/riveted/boss
+#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(30) ///turf/simulated/wall/mineral/titanium/survival
+
+#define SMOOTH_GROUP_GRASS S_TURF(31) ///turf/simulated/floor/grass
+#define SMOOTH_GROUP_JUNGLE_GRASS S_TURF(32) ///turf/simulated/floor/grass/jungle
+
+#define MAX_S_TURF SMOOTH_GROUP_JUNGLE_GRASS //Always match this value with the one above it.
+
+
+#define S_OBJ(num) (MAX_S_TURF + 1 + num)
+/* /obj included */
+
+#define SMOOTH_GROUP_WALLS S_OBJ(0) ///turf/simulated/wall, /obj/structure/falsewall
+#define SMOOTH_GROUP_URANIUM_WALLS S_OBJ(1) ///turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium
+#define SMOOTH_GROUP_GOLD_WALLS S_OBJ(2) ///turf/simulated/wall/mineral/gold, /obj/structure/falsewall/gold
+#define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/simulated/wall/mineral/silver, /obj/structure/falsewall/silver
+#define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond
+#define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma
+#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/simulated/wall/mineral/bananium, /obj/structure/falsewall/bananium
+#define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/simulated/wall/mineral/sandstone, /obj/structure/falsewall/sandstone
+#define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood
+#define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/simulated/wall/mineral/iron, /obj/structure/falsewall/iron
+#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor
+#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/simulated/wall/mineral/titanium, /obj/structure/falsewall/titanium
+#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/simulated/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium
+#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/simulated/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod
+#define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall
+#define SMOOTH_GROUP_BRASS_WALL S_OBJ(16) ///turf/simulated/wall/mineral/brass, /obj/structure/falsewall/brass
+
+
+#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/simulated/indestructible/fakeglass, /obj/structure/window/full/basic, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /obj/structure/window/full/reinforced
+#define SMOOTH_GROUP_WINDOW_FULLTILE_BRASS S_OBJ(22) ///obj/structure/window/brass/fulltile
+#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/simulated/indestructible/opsglass, /obj/structure/window/plasma/reinforced/plastitanium
+#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle
+
+#define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice
+
+#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock
+
+#define SMOOTH_GROUP_TABLES S_OBJ(50) ///obj/structure/table
+#define SMOOTH_GROUP_WOOD_TABLES S_OBJ(51) ///obj/structure/table/wood
+#define SMOOTH_GROUP_FANCY_WOOD_TABLES S_OBJ(52) ///obj/structure/table/wood/fancy
+#define SMOOTH_GROUP_BRASS_TABLES S_OBJ(53) ///obj/structure/table/brass
+#define SMOOTH_GROUP_ABDUCTOR_TABLES S_OBJ(54) ///obj/structure/table/abductor
+#define SMOOTH_GROUP_GLASS_TABLES S_OBJ(55) ///obj/structure/table/glass
+
+#define SMOOTH_GROUP_ALIEN_NEST S_OBJ(59) ///obj/structure/bed/nest
+#define SMOOTH_GROUP_ALIEN_RESIN S_OBJ(60) ///obj/structure/alien/resin
+#define SMOOTH_GROUP_ALIEN_WALLS S_OBJ(61) ///obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane
+#define SMOOTH_GROUP_ALIEN_WEEDS S_OBJ(62) ///obj/structure/alien/weeds
+
+#define SMOOTH_GROUP_SECURITY_BARRICADE S_OBJ(63) ///obj/structure/barricade/security
+#define SMOOTH_GROUP_SANDBAGS S_OBJ(64) ///obj/structure/barricade/sandbags
+
+#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/simulated/indestructible/opsglass, /obj/structure/shuttle
+
+#define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt
+
+#define SMOOTH_GROUP_RIPPLE S_OBJ(68) ///obj/effect/temp_visual/ripple
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index bff5100982a..b899e3fe4c7 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -12,6 +12,7 @@
#define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
#define SPACE_LAYER 1.8
+#define GRASS_UNDER_LAYER 1.9
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
#define MID_TURF_LAYER 2.02
#define HIGH_TURF_LAYER 2.03
diff --git a/code/__HELPERS/bitflag_lists.dm b/code/__HELPERS/bitflag_lists.dm
new file mode 100644
index 00000000000..a665d92cd41
--- /dev/null
+++ b/code/__HELPERS/bitflag_lists.dm
@@ -0,0 +1,25 @@
+GLOBAL_LIST_EMPTY(bitflag_lists)
+
+/**
+ * System for storing bitflags past the 24 limit, making use of an associative list.
+ *
+ * Macro converts a list of integers into an associative list of bitflag entries for quicker comparison.
+ * Example: list(0, 4, 26, 32)) => list( "0" = ( (1<<0) | (1<<4) ), "1" = ( (1<<2) | (1<<8) ) )
+ * Lists are cached into a global list of lists to avoid identical duplicates.
+ * This system makes value comparisons faster than pairing every element of one list with every element of the other for evaluation.
+ *
+ * Arguments:
+ * * target - List of integers.
+ */
+#define SET_BITFLAG_LIST(target) \
+ do { \
+ var/txt_signature = target.Join("-"); \
+ if(!GLOB.bitflag_lists[txt_signature]) { \
+ var/list/new_bitflag_list = list(); \
+ for(var/value in target) { \
+ new_bitflag_list["[round(value / 24)]"] |= (1 << (value % 24)); \
+ }; \
+ GLOB.bitflag_lists[txt_signature] = new_bitflag_list; \
+ }; \
+ target = GLOB.bitflag_lists[txt_signature]; \
+ } while (FALSE)
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index 90873b6309a..8ee7bfc0e2f 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -1,16 +1,17 @@
//generic (by snowflake) tile smoothing code; smooth your icons with this!
/*
- Each tile is divided in 4 corners, each corner has an image associated to it; the tile is then overlayed by these 4 images
- 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.
+ 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 '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.
+ Otherwise, put all the smoothing groups you want the atom icon to smooth with in 'canSmoothWith', including the group of the atom itself.
+ Smoothing groups are just shared flags between objects. If one of the 'canSmoothWith' of A matches one of the `smoothing_groups` of B, then A will smooth with B.
Each atom has its own icon file with all the possible corner states. See 'smooth_wall.dmi' for a template.
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_CORNERS' 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.
@@ -20,302 +21,399 @@
A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is
not set properly, the underlay will default to regular floor plating.
- To see an example of a diagonal wall, see '/turf/simulated/wall/shuttle' and its subtypes.
+ To see an example of a diagonal wall, see '/turf/simulated/wall/mineral/titanium' and its subtypes.
*/
//Redefinitions of the diagonal directions so they can be stored in one var without conflicts
-#define N_NORTH 2
-#define N_SOUTH 4
-#define N_EAST 16
-#define N_WEST 256
-#define N_NORTHEAST 32
-#define N_NORTHWEST 512
-#define N_SOUTHEAST 64
-#define N_SOUTHWEST 1024
+#define NORTH_JUNCTION NORTH //(1<<0)
+#define SOUTH_JUNCTION SOUTH //(1<<1)
+#define EAST_JUNCTION EAST //(1<<2)
+#define WEST_JUNCTION WEST //(1<<3)
+#define NORTHEAST_JUNCTION (1<<4)
+#define SOUTHEAST_JUNCTION (1<<5)
+#define SOUTHWEST_JUNCTION (1<<6)
+#define NORTHWEST_JUNCTION (1<<7)
-#define SMOOTH_FALSE 0 //not smooth
-#define SMOOTH_TRUE 1 //smooths with exact specified types or just itself
-#define SMOOTH_MORE 2 //smooths with all subtypes of specified types or just itself (this value can replace SMOOTH_TRUE)
-#define SMOOTH_DIAGONAL 4 //if atom should smooth diagonally, this should be present in 'smooth' var
-#define SMOOTH_BORDER 8 //atom will smooth with the borders of the map
+DEFINE_BITFIELD(smoothing_junction, list(
+ "NORTH_JUNCTION" = NORTH_JUNCTION,
+ "SOUTH_JUNCTION" = SOUTH_JUNCTION,
+ "EAST_JUNCTION" = EAST_JUNCTION,
+ "WEST_JUNCTION" = WEST_JUNCTION,
+ "NORTHEAST_JUNCTION" = NORTHEAST_JUNCTION,
+ "SOUTHEAST_JUNCTION" = SOUTHEAST_JUNCTION,
+ "SOUTHWEST_JUNCTION" = SOUTHWEST_JUNCTION,
+ "NORTHWEST_JUNCTION" = NORTHWEST_JUNCTION,
+))
-#define NULLTURF_BORDER 123456789
+
+#define NO_ADJ_FOUND 0
+#define ADJ_FOUND 1
+#define NULLTURF_BORDER 2
#define DEFAULT_UNDERLAY_ICON 'icons/turf/floors.dmi'
#define DEFAULT_UNDERLAY_ICON_STATE "plating"
-#define DEFAULT_UNDERLAY_IMAGE image(DEFAULT_UNDERLAY_ICON, DEFAULT_UNDERLAY_ICON_STATE)
-/atom/var/smooth = SMOOTH_FALSE
-/atom/var/top_left_corner
-/atom/var/top_right_corner
-/atom/var/bottom_left_corner
-/atom/var/bottom_right_corner
-/atom/var/list/canSmoothWith = null // TYPE PATHS I CAN SMOOTH WITH~~~~~ If this is null and atom is smooth, it smooths only with itself
-/atom/movable/var/can_be_unanchored = FALSE
-/turf/var/list/fixed_underlay = null
-/proc/calculate_adjacencies(atom/A)
- if(!A.loc)
- return 0
+#define SET_ADJ_IN_DIR(source, junction, direction, direction_flag) \
+ do { \
+ var/turf/neighbor = get_step(source, direction); \
+ if(!neighbor) { \
+ if(source.smoothing_flags & SMOOTH_BORDER) { \
+ junction |= direction_flag; \
+ }; \
+ }; \
+ else { \
+ if(!isnull(neighbor.smoothing_groups)) { \
+ for(var/target in source.canSmoothWith) { \
+ if(!(source.canSmoothWith[target] & neighbor.smoothing_groups[target])) { \
+ continue; \
+ }; \
+ junction |= direction_flag; \
+ break; \
+ }; \
+ }; \
+ if(!(junction & direction_flag) && source.smoothing_flags & SMOOTH_OBJ) { \
+ for(var/obj/thing in neighbor) { \
+ if(!thing.anchored || isnull(thing.smoothing_groups)) { \
+ continue; \
+ }; \
+ for(var/target in source.canSmoothWith) { \
+ if(!(source.canSmoothWith[target] & thing.smoothing_groups[target])) { \
+ continue; \
+ }; \
+ junction |= direction_flag; \
+ break; \
+ }; \
+ if(junction & direction_flag) { \
+ break; \
+ }; \
+ }; \
+ }; \
+ }; \
+ } while(FALSE)
- var/adjacencies = 0
- var/atom/movable/AM
- if(ismovable(A))
- AM = A
- if(AM.can_be_unanchored && !AM.anchored)
- return 0
+///Scans all adjacent turfs to find targets to smooth with.
+/atom/proc/calculate_adjacencies()
+ . = NONE
+
+ if(!loc)
+ return
for(var/direction in GLOB.cardinal)
- AM = find_type_in_direction(A, direction)
- if(AM == NULLTURF_BORDER)
- if((A.smooth & SMOOTH_BORDER))
- adjacencies |= 1 << direction
- else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
- adjacencies |= 1 << direction
+ switch(find_type_in_direction(direction))
+ if(NULLTURF_BORDER)
+ if((smoothing_flags & SMOOTH_BORDER))
+ . |= direction //BYOND and smooth dirs are the same for cardinals
+ if(ADJ_FOUND)
+ . |= direction //BYOND and smooth dirs are the same for cardinals
- if(adjacencies & N_NORTH)
- if(adjacencies & N_WEST)
- AM = find_type_in_direction(A, NORTHWEST)
- if(AM == NULLTURF_BORDER)
- if((A.smooth & 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))
- adjacencies |= N_NORTHEAST
- else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
- adjacencies |= N_NORTHEAST
+ if(. & NORTH_JUNCTION)
+ if(. & WEST_JUNCTION)
+ switch(find_type_in_direction(NORTHWEST))
+ if(NULLTURF_BORDER)
+ if((smoothing_flags & SMOOTH_BORDER))
+ . |= NORTHWEST_JUNCTION
+ if(ADJ_FOUND)
+ . |= NORTHWEST_JUNCTION
- if(adjacencies & N_SOUTH)
- if(adjacencies & N_WEST)
- AM = find_type_in_direction(A, SOUTHWEST)
- if(AM == NULLTURF_BORDER)
- if((A.smooth & 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))
- adjacencies |= N_SOUTHEAST
- else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
- adjacencies |= N_SOUTHEAST
+ if(. & EAST_JUNCTION)
+ switch(find_type_in_direction(NORTHEAST))
+ if(NULLTURF_BORDER)
+ if((smoothing_flags & SMOOTH_BORDER))
+ . |= NORTHEAST_JUNCTION
+ if(ADJ_FOUND)
+ . |= NORTHEAST_JUNCTION
- return adjacencies
+ if(. & SOUTH_JUNCTION)
+ if(. & WEST_JUNCTION)
+ switch(find_type_in_direction(SOUTHWEST))
+ if(NULLTURF_BORDER)
+ if((smoothing_flags & SMOOTH_BORDER))
+ . |= SOUTHWEST_JUNCTION
+ if(ADJ_FOUND)
+ . |= SOUTHWEST_JUNCTION
-//do not use, use queue_smooth(atom)
-/proc/smooth_icon(atom/A)
- if(!A || !A.smooth || !A.z)
+ if(. & EAST_JUNCTION)
+ switch(find_type_in_direction(SOUTHEAST))
+ if(NULLTURF_BORDER)
+ if((smoothing_flags & SMOOTH_BORDER))
+ . |= SOUTHEAST_JUNCTION
+ if(ADJ_FOUND)
+ . |= SOUTHEAST_JUNCTION
+
+
+/atom/movable/calculate_adjacencies()
+ if(can_be_unanchored && !anchored)
+ return NONE
+ return ..()
+
+
+//do not use, use QUEUE_SMOOTH(atom)
+/atom/proc/smooth_icon()
+ smoothing_flags &= ~SMOOTH_QUEUED
+ if(!z) //nullspace are not sending their best
+ error("[type] called smooth_icon() without being on a z-level")
return
- if(QDELETED(A))
- return
- if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE))
- var/adjacencies = calculate_adjacencies(A)
-
- if(A.smooth & SMOOTH_DIAGONAL)
- A.diagonal_smooth(adjacencies)
+ if(smoothing_flags & SMOOTH_CORNERS)
+ if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS)
+ corners_diagonal_smooth(calculate_adjacencies())
else
- cardinal_smooth(A, adjacencies)
+ corners_cardinal_smooth(src, calculate_adjacencies())
+ else if(smoothing_flags & SMOOTH_BITMASK)
+ bitmask_smooth()
-/atom/proc/diagonal_smooth(adjacencies)
+
+/atom/proc/corners_diagonal_smooth(adjacencies)
switch(adjacencies)
- if(N_NORTH|N_WEST)
+ if(NORTH_JUNCTION|WEST_JUNCTION)
replace_smooth_overlays("d-se","d-se-0")
- if(N_NORTH|N_EAST)
+ if(NORTH_JUNCTION|EAST_JUNCTION)
replace_smooth_overlays("d-sw","d-sw-0")
- if(N_SOUTH|N_WEST)
+ if(SOUTH_JUNCTION|WEST_JUNCTION)
replace_smooth_overlays("d-ne","d-ne-0")
- if(N_SOUTH|N_EAST)
+ if(SOUTH_JUNCTION|EAST_JUNCTION)
replace_smooth_overlays("d-nw","d-nw-0")
- if(N_NORTH|N_WEST|N_NORTHWEST)
+ if(NORTH_JUNCTION|WEST_JUNCTION|NORTHWEST_JUNCTION)
replace_smooth_overlays("d-se","d-se-1")
- if(N_NORTH|N_EAST|N_NORTHEAST)
+ if(NORTH_JUNCTION|EAST_JUNCTION|NORTHEAST_JUNCTION)
replace_smooth_overlays("d-sw","d-sw-1")
- if(N_SOUTH|N_WEST|N_SOUTHWEST)
+ if(SOUTH_JUNCTION|WEST_JUNCTION|SOUTHWEST_JUNCTION)
replace_smooth_overlays("d-ne","d-ne-1")
- if(N_SOUTH|N_EAST|N_SOUTHEAST)
+ if(SOUTH_JUNCTION|EAST_JUNCTION|SOUTHEAST_JUNCTION)
replace_smooth_overlays("d-nw","d-nw-1")
else
- cardinal_smooth(src, adjacencies)
+ corners_cardinal_smooth(src, adjacencies)
return
icon_state = ""
return adjacencies
-//only walls should have a need to handle underlays
-/turf/simulated/wall/diagonal_smooth(adjacencies)
- adjacencies = reverse_ndir(..())
- if(adjacencies)
- var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = FLOOR_PLANE)
- var/list/U = list(underlay_appearance)
- if(fixed_underlay)
- if(fixed_underlay["space"])
- underlay_appearance.icon = 'icons/turf/space.dmi'
- underlay_appearance.icon_state = SPACE_ICON_STATE
- underlay_appearance.plane = PLANE_SPACE
- else
- underlay_appearance.icon = fixed_underlay["icon"]
- underlay_appearance.icon_state = fixed_underlay["icon_state"]
- else
- var/turned_adjacency = turn(adjacencies, 180)
- var/turf/T = get_step(src, turned_adjacency)
- if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
- T = get_step(src, turn(adjacencies, 135))
- if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
- T = get_step(src, turn(adjacencies, 225))
- //if all else fails, ask our own turf
- if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency) && !get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
- underlay_appearance.icon = DEFAULT_UNDERLAY_ICON
- underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
- underlays = U
- // Drop posters which were previously placed on this wall.
- for(var/obj/structure/sign/poster/P in src)
- P.roll_and_drop(src)
-
-/proc/cardinal_smooth(atom/A, adjacencies)
+/atom/proc/corners_cardinal_smooth(atom/A, adjacencies)
//NW CORNER
var/nw = "1-i"
- if((adjacencies & N_NORTH) && (adjacencies & N_WEST))
- if(adjacencies & N_NORTHWEST)
+ if((adjacencies & NORTH_JUNCTION) && (adjacencies & WEST_JUNCTION))
+ if(adjacencies & NORTHWEST_JUNCTION)
nw = "1-f"
else
nw = "1-nw"
else
- if(adjacencies & N_NORTH)
+ if(adjacencies & NORTH_JUNCTION)
nw = "1-n"
- else if(adjacencies & N_WEST)
+ else if(adjacencies & WEST_JUNCTION)
nw = "1-w"
//NE CORNER
var/ne = "2-i"
- if((adjacencies & N_NORTH) && (adjacencies & N_EAST))
- if(adjacencies & N_NORTHEAST)
+ if((adjacencies & NORTH_JUNCTION) && (adjacencies & EAST_JUNCTION))
+ if(adjacencies & NORTHEAST_JUNCTION)
ne = "2-f"
else
ne = "2-ne"
else
- if(adjacencies & N_NORTH)
+ if(adjacencies & NORTH_JUNCTION)
ne = "2-n"
- else if(adjacencies & N_EAST)
+ else if(adjacencies & EAST_JUNCTION)
ne = "2-e"
//SW CORNER
var/sw = "3-i"
- if((adjacencies & N_SOUTH) && (adjacencies & N_WEST))
- if(adjacencies & N_SOUTHWEST)
+ if((adjacencies & SOUTH_JUNCTION) && (adjacencies & WEST_JUNCTION))
+ if(adjacencies & SOUTHWEST_JUNCTION)
sw = "3-f"
else
sw = "3-sw"
else
- if(adjacencies & N_SOUTH)
+ if(adjacencies & SOUTH_JUNCTION)
sw = "3-s"
- else if(adjacencies & N_WEST)
+ else if(adjacencies & WEST_JUNCTION)
sw = "3-w"
//SE CORNER
var/se = "4-i"
- if((adjacencies & N_SOUTH) && (adjacencies & N_EAST))
- if(adjacencies & N_SOUTHEAST)
+ if((adjacencies & SOUTH_JUNCTION) && (adjacencies & EAST_JUNCTION))
+ if(adjacencies & SOUTHEAST_JUNCTION)
se = "4-f"
else
se = "4-se"
else
- if(adjacencies & N_SOUTH)
+ if(adjacencies & SOUTH_JUNCTION)
se = "4-s"
- else if(adjacencies & N_EAST)
+ else if(adjacencies & EAST_JUNCTION)
se = "4-e"
- var/list/New = list()
+ var/list/new_overlays = list()
if(A.top_left_corner != nw)
- A.overlays -= A.top_left_corner
+ A.cut_overlay(top_left_corner)
A.top_left_corner = nw
- New += nw
+ new_overlays += nw
if(A.top_right_corner != ne)
- A.overlays -= A.top_right_corner
+ A.cut_overlay(top_right_corner)
A.top_right_corner = ne
- New += ne
+ new_overlays += ne
if(A.bottom_right_corner != sw)
- A.overlays -= A.bottom_right_corner
+ A.cut_overlay(bottom_right_corner)
A.bottom_right_corner = sw
- New += sw
+ new_overlays += sw
if(A.bottom_left_corner != se)
- A.overlays -= A.bottom_left_corner
+ A.cut_overlay(bottom_left_corner)
A.bottom_left_corner = se
- New += se
+ new_overlays += se
- if(New.len)
- A.overlays.Add(New)
+ if(new_overlays.len)
+ A.add_overlay(new_overlays)
-/proc/find_type_in_direction(atom/source, direction)
- var/turf/target_turf = get_step(source, direction)
+
+///Scans direction to find targets to smooth with.
+/atom/proc/find_type_in_direction(direction)
+ var/turf/target_turf = get_step(src, direction)
if(!target_turf)
return NULLTURF_BORDER
- if(source.canSmoothWith)
- var/atom/A
- if(source.smooth & SMOOTH_MORE)
- for(var/a_type in source.canSmoothWith)
- if( istype(target_turf, a_type) )
- return target_turf
- A = locate(a_type) in target_turf
- if(A)
- return A
- return null
+ var/area/target_area = get_area(target_turf)
+ var/area/source_area = get_area(src)
+ if((source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) || (target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)))
+ return NO_ADJ_FOUND
+
+ if(isnull(canSmoothWith)) //special case in which it will only smooth with itself
+ if(isturf(src))
+ return (type == target_turf.type) ? ADJ_FOUND : NO_ADJ_FOUND
+ var/atom/matching_obj = locate(type) in target_turf
+ return (matching_obj && matching_obj.type == type) ? ADJ_FOUND : NO_ADJ_FOUND
+
+ if(!isnull(target_turf.smoothing_groups))
+ for(var/target in canSmoothWith)
+ if(!(canSmoothWith[target] & target_turf.smoothing_groups[target]))
+ continue
+ return ADJ_FOUND
+
+ if(smoothing_flags & SMOOTH_OBJ)
+ for(var/am in target_turf)
+ var/atom/movable/thing = am
+ if(!thing.anchored || isnull(thing.smoothing_groups))
+ continue
+ for(var/target in canSmoothWith)
+ if(!(canSmoothWith[target] & thing.smoothing_groups[target]))
+ continue
+ return ADJ_FOUND
+
+ return NO_ADJ_FOUND
+
+
+/**
+ * Basic smoothing proc. The atom checks for adjacent directions to smooth with and changes the icon_state based on that.
+ *
+ * Returns the previous smoothing_junction state so the previous state can be compared with the new one after the proc ends, and see the changes, if any.
+ *
+*/
+/atom/proc/bitmask_smooth()
+ var/new_junction = NONE
+
+ for(var/direction in GLOB.cardinal) //Cardinal case first.
+ SET_ADJ_IN_DIR(src, new_junction, direction, direction)
+
+ if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST)))
+ set_smoothed_icon_state(new_junction)
+ return
+
+ if(new_junction & NORTH_JUNCTION)
+ if(new_junction & WEST_JUNCTION)
+ SET_ADJ_IN_DIR(src, new_junction, NORTHWEST, NORTHWEST_JUNCTION)
+
+ if(new_junction & EAST_JUNCTION)
+ SET_ADJ_IN_DIR(src, new_junction, NORTHEAST, NORTHEAST_JUNCTION)
+
+ if(new_junction & SOUTH_JUNCTION)
+ if(new_junction & WEST_JUNCTION)
+ SET_ADJ_IN_DIR(src, new_junction, SOUTHWEST, SOUTHWEST_JUNCTION)
+
+ if(new_junction & EAST_JUNCTION)
+ SET_ADJ_IN_DIR(src, new_junction, SOUTHEAST, SOUTHEAST_JUNCTION)
+
+ set_smoothed_icon_state(new_junction)
+
+
+///Changes the icon state based on the new junction bitmask. Returns the old junction value.
+/atom/proc/set_smoothed_icon_state(new_junction)
+ . = smoothing_junction
+ smoothing_junction = new_junction
+ icon_state = "[base_icon_state]-[smoothing_junction]"
+
+
+/turf/simulated/set_smoothed_icon_state(new_junction)
+ . = ..()
+ if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS)
+ switch(new_junction)
+ if(
+ NORTH_JUNCTION|WEST_JUNCTION,
+ NORTH_JUNCTION|EAST_JUNCTION,
+ SOUTH_JUNCTION|WEST_JUNCTION,
+ SOUTH_JUNCTION|EAST_JUNCTION,
+ NORTH_JUNCTION|WEST_JUNCTION|NORTHWEST_JUNCTION,
+ NORTH_JUNCTION|EAST_JUNCTION|NORTHEAST_JUNCTION,
+ SOUTH_JUNCTION|WEST_JUNCTION|SOUTHWEST_JUNCTION,
+ SOUTH_JUNCTION|EAST_JUNCTION|SOUTHEAST_JUNCTION
+ )
+ icon_state = "[base_icon_state]-[smoothing_junction]-d"
+ if(!fixed_underlay && new_junction != .) // Mutable underlays?
+ var/junction_dir = reverse_ndir(smoothing_junction)
+ var/turned_adjacency = reverse_direction(junction_dir)
+ var/turf/neighbor_turf = get_step(src, turned_adjacency & (NORTH|SOUTH))
+ var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = FLOOR_PLANE)
+ if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
+ neighbor_turf = get_step(src, turned_adjacency & (EAST|WEST))
+ if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
+ neighbor_turf = get_step(src, turned_adjacency)
+ if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
+ if(!get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) //if all else fails, ask our own turf
+ underlay_appearance.icon = DEFAULT_UNDERLAY_ICON
+ underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
+ underlays = list(underlay_appearance)
+
+
+/turf/simulated/floor/set_smoothed_icon_state(new_junction)
+ if(broken || burnt)
+ return
+ return ..()
- for(var/a_type in source.canSmoothWith)
- if(a_type == target_turf.type)
- return target_turf
- A = locate(a_type) in target_turf
- if(A && A.type == a_type)
- return A
- return null
- else
- if(isturf(source))
- return source.type == target_turf.type ? target_turf : null
- var/atom/A = locate(source.type) in target_turf
- return A && A.type == source.type ? A : null
//Icon smoothing helpers
-
/proc/smooth_zlevel(zlevel, now = FALSE)
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 & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if(now)
- smooth_icon(T)
+ T.smooth_icon()
else
- queue_smooth(T)
+ QUEUE_SMOOTH(T)
for(var/R in T)
var/atom/A = R
- if(A.smooth)
+ if(A.smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if(now)
- smooth_icon(A)
+ A.smooth_icon()
else
- queue_smooth(A)
+ QUEUE_SMOOTH(A)
+
/atom/proc/clear_smooth_overlays()
- overlays -= top_left_corner
+ cut_overlay(top_left_corner)
top_left_corner = null
- overlays -= top_right_corner
+ cut_overlay(top_right_corner)
top_right_corner = null
- overlays -= bottom_right_corner
+ cut_overlay(bottom_right_corner)
bottom_right_corner = null
- overlays -= bottom_left_corner
+ cut_overlay(bottom_left_corner)
bottom_left_corner = null
+
/atom/proc/replace_smooth_overlays(nw, ne, sw, se)
clear_smooth_overlays()
var/list/O = list()
@@ -327,64 +425,70 @@
O += sw
bottom_right_corner = se
O += se
- overlays.Add(O)
+ add_overlay(O)
+
/proc/reverse_ndir(ndir)
switch(ndir)
- if(N_NORTH)
+ if(NORTH_JUNCTION)
return NORTH
- if(N_SOUTH)
+ if(SOUTH_JUNCTION)
return SOUTH
- if(N_WEST)
+ if(WEST_JUNCTION)
return WEST
- if(N_EAST)
+ if(EAST_JUNCTION)
return EAST
- if(N_NORTHWEST)
+ if(NORTHWEST_JUNCTION)
return NORTHWEST
- if(N_NORTHEAST)
+ if(NORTHEAST_JUNCTION)
return NORTHEAST
- if(N_SOUTHEAST)
+ if(SOUTHEAST_JUNCTION)
return SOUTHEAST
- if(N_SOUTHWEST)
+ if(SOUTHWEST_JUNCTION)
return SOUTHWEST
- if(N_NORTH|N_WEST)
+ if(NORTH_JUNCTION | WEST_JUNCTION)
return NORTHWEST
- if(N_NORTH|N_EAST)
+ if(NORTH_JUNCTION | EAST_JUNCTION)
return NORTHEAST
- if(N_SOUTH|N_WEST)
+ if(SOUTH_JUNCTION | WEST_JUNCTION)
return SOUTHWEST
- if(N_SOUTH|N_EAST)
+ if(SOUTH_JUNCTION | EAST_JUNCTION)
return SOUTHEAST
- if(N_NORTH|N_WEST|N_NORTHWEST)
+ if(NORTH_JUNCTION | WEST_JUNCTION | NORTHWEST_JUNCTION)
return NORTHWEST
- if(N_NORTH|N_EAST|N_NORTHEAST)
+ if(NORTH_JUNCTION | EAST_JUNCTION | NORTHEAST_JUNCTION)
return NORTHEAST
- if(N_SOUTH|N_WEST|N_SOUTHWEST)
+ if(SOUTH_JUNCTION | WEST_JUNCTION | SOUTHWEST_JUNCTION)
return SOUTHWEST
- if(N_SOUTH|N_EAST|N_SOUTHEAST)
+ if(SOUTH_JUNCTION | EAST_JUNCTION | SOUTHEAST_JUNCTION)
return SOUTHEAST
else
- return 0
+ return NONE
-//SSicon_smooth
-/proc/queue_smooth_neighbors(atom/A)
- for(var/V in orange(1,A))
- var/atom/T = V
- if(T.smooth)
- queue_smooth(T)
-
-//SSicon_smooth
-/proc/queue_smooth(atom/A)
- if(SSicon_smooth)
- SSicon_smooth.smooth_queue[A] = A
- SSicon_smooth.can_fire = 1
- else
- smooth_icon(A)
//Example smooth wall
/turf/simulated/wall/smooth
name = "smooth wall"
icon = 'icons/turf/smooth_wall.dmi'
icon_state = "smooth"
- smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL|SMOOTH_BORDER
+ smoothing_flags = SMOOTH_CORNERS|SMOOTH_DIAGONAL_CORNERS|SMOOTH_BORDER
+ smoothing_groups = null
canSmoothWith = null
+
+#undef NORTH_JUNCTION
+#undef SOUTH_JUNCTION
+#undef EAST_JUNCTION
+#undef WEST_JUNCTION
+#undef NORTHEAST_JUNCTION
+#undef NORTHWEST_JUNCTION
+#undef SOUTHEAST_JUNCTION
+#undef SOUTHWEST_JUNCTION
+
+#undef NO_ADJ_FOUND
+#undef ADJ_FOUND
+#undef NULLTURF_BORDER
+
+#undef DEFAULT_UNDERLAY_ICON
+#undef DEFAULT_UNDERLAY_ICON_STATE
+
+#undef SET_ADJ_IN_DIR
diff --git a/code/__HELPERS/string_assoc_lists.dm b/code/__HELPERS/string_assoc_lists.dm
new file mode 100644
index 00000000000..cded3a34969
--- /dev/null
+++ b/code/__HELPERS/string_assoc_lists.dm
@@ -0,0 +1,17 @@
+GLOBAL_LIST_EMPTY(string_assoc_lists)
+
+/**
+ * Caches associative lists with non-numeric stringify-able index keys and stringify-able values (text/typepath -> text/path/number).
+ */
+/datum/proc/string_assoc_list(list/values)
+ var/list/string_id = list()
+ for(var/val in values)
+ string_id += "[val]_[values[val]]"
+ string_id = string_id.Join("-")
+
+ . = GLOB.string_assoc_lists[string_id]
+
+ if(.)
+ return
+
+ return GLOB.string_assoc_lists[string_id] = values
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
new file mode 100644
index 00000000000..4ca56d2e497
--- /dev/null
+++ b/code/_globalvars/bitfields.dm
@@ -0,0 +1,6 @@
+/// Specifies a bitfield for smarter debugging
+/datum/bitfield
+ /// The variable name that contains the bitfield
+ var/variable
+ /// An associative list of the readable flag and its true value
+ var/list/flags
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 785c874eea6..b149112f5f7 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -12,7 +12,7 @@ SUBSYSTEM_DEF(icon_smooth)
while(smooth_queue.len)
var/atom/A = smooth_queue[smooth_queue.len]
smooth_queue.len--
- smooth_icon(A)
+ A.smooth_icon()
if(MC_TICK_CHECK)
return
if(!smooth_queue.len)
@@ -22,12 +22,12 @@ SUBSYSTEM_DEF(icon_smooth)
log_startup_progress("Smoothing atoms...")
// Smooth EVERYTHING in the world
for(var/turf/T in world)
- if(T.smooth)
- smooth_icon(T)
+ if(T.smoothing_flags)
+ T.smooth_icon()
for(var/A in T)
var/atom/AA = A
- if(AA.smooth)
- smooth_icon(AA)
+ if(AA.smoothing_flags)
+ AA.smooth_icon()
CHECK_TICK
// Incase any new atoms were added to the smoothing queue for whatever reason
@@ -37,7 +37,19 @@ SUBSYSTEM_DEF(icon_smooth)
var/atom/A = V
if(!A || A.z <= 2)
continue
- smooth_icon(A)
+ A.smooth_icon()
CHECK_TICK
return ..()
+
+/datum/controller/subsystem/icon_smooth/proc/add_to_queue(atom/thing)
+ if(thing.smoothing_flags & SMOOTH_QUEUED)
+ return
+ 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.smoothing_flags &= ~SMOOTH_QUEUED
+ smooth_queue -= thing
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 5ba3191c429..447442a9ac0 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -76,6 +76,8 @@
///Used to decide what the maximum time between ambience is
var/max_ambience_cooldown = 90 SECONDS
+ var/area/area_limited_icon_smoothing
+
/area/New(loc, ...)
if(!there_can_be_many) // Has to be done in New else the maploader will fuck up and find subtypes for the parent
GLOB.all_unique_areas[type] = src
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e815dd545ac..6c18982600c 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -59,6 +59,25 @@
/// Last color calculated for the the chatmessage overlays. Used for caching.
var/chat_color
+ ///Icon-smoothing behavior.
+ var/smoothing_flags = NONE
+ ///Smoothing variable
+ var/top_left_corner
+ ///Smoothing variable
+ var/top_right_corner
+ ///Smoothing variable
+ var/bottom_left_corner
+ ///Smoothing variable
+ var/bottom_right_corner
+ ///What smoothing groups does this atom belongs to, to match canSmoothWith. If null, nobody can smooth with it.
+ var/list/smoothing_groups = null
+ ///List of smoothing groups this atom can smooth with. If this is null and atom is smooth, it smooths only with itself.
+ var/list/canSmoothWith = null
+ ///What directions this is currently smoothing with. IMPORTANT: This uses the smoothing direction flags as defined in icon_smoothing.dm, instead of the BYOND flags.
+ var/smoothing_junction = null //This starts as null for us to know when it's first set, but after that it will hold a 8-bit mask ranging from 0 to 255.
+ ///Used for changing icon states for different base sprites.
+ var/base_icon_state
+
/atom/New(loc, ...)
SHOULD_CALL_PARENT(TRUE)
if(GLOB.use_preloader && (src.type == GLOB._preloader.target_path))//in case the instanciated atom is creating other atoms in New()
@@ -108,6 +127,15 @@
ComponentInitialize()
+ if(length(smoothing_groups))
+ sortTim(smoothing_groups) //In case it's not properly ordered, let's avoid duplicate entries with the same values.
+ SET_BITFLAG_LIST(smoothing_groups)
+ if(length(canSmoothWith))
+ sortTim(canSmoothWith)
+ if(canSmoothWith[length(canSmoothWith)] > MAX_S_TURF) //If the last element is higher than the maximum turf-only value, then it must scan turf contents for smoothing targets.
+ smoothing_flags |= SMOOTH_OBJ
+ SET_BITFLAG_LIST(canSmoothWith)
+
return INITIALIZE_HINT_NORMAL
//called if Initialize returns INITIALIZE_HINT_LATELOAD
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 83277765444..1bb5a062e4b 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -715,12 +715,14 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien table"
desc = "Advanced flat surface technology at work!"
icon = 'icons/obj/smooth_structures/alien_table.dmi'
- icon_state = "alien_table"
+ icon_state = "alien_table-0"
+ base_icon_state = "alien_table"
buildstack = /obj/item/stack/sheet/mineral/abductor
framestack = /obj/item/stack/sheet/mineral/abductor
buildstackamount = 1
framestackamount = 1
- canSmoothWith = null
+ smoothing_groups = list(SMOOTH_GROUP_ABDUCTOR_TABLES)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_TABLES)
frame = /obj/structure/table_frame/abductor
/obj/machinery/optable/abductor
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 4de42931b6d..84b96119e2b 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -327,19 +327,43 @@
/turf/simulated/floor/holofloor/
thermal_conductivity = 0
icon_state = "plating"
-/turf/simulated/floor/holofloor/grass
- name = "Lush Grass"
- icon_state = "grass1"
- floor_tile = /obj/item/stack/tile/grass
-/turf/simulated/floor/holofloor/grass/Initialize(mapload)
+/turf/simulated/floor/holofloor/carpet
+ name = "carpet"
+ icon = 'icons/turf/floors/carpet.dmi'
+ icon_state = "carpet-255"
+ base_icon_state = "carpet"
+ floor_tile = /obj/item/stack/tile/carpet
+ broken_states = list("damaged")
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET)
+ footstep = FOOTSTEP_CARPET
+ barefootstep = FOOTSTEP_CARPET_BAREFOOT
+ clawfootstep = FOOTSTEP_CARPET_BAREFOOT
+ heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+
+/turf/simulated/floor/holofloor/carpet/Initialize(mapload)
. = ..()
update_icon()
-/turf/simulated/floor/holofloor/grass/update_icon()
- ..()
- if(!(icon_state in list("grass1", "grass2", "grass3", "grass4", "sand")))
- icon_state = "grass[pick("1","2","3","4")]"
+/turf/simulated/floor/holofloor/carpet/update_icon()
+ if(!..())
+ return 0
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH(src)
+/turf/simulated/floor/holofloor/grass
+ name = "Lush Grass"
+ icon = 'icons/turf/floors/grass.dmi'
+ icon_state = "grass-0"
+ base_icon_state = "grass"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS)
+ canSmoothWith = list(SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS)
+ pixel_x = -9
+ pixel_y = -9
+ layer = ABOVE_OPEN_TURF_LAYER
+ floor_tile = /obj/item/stack/tile/grass
/turf/simulated/floor/holofloor/attackby(obj/item/W as obj, mob/user as mob, params)
return
@@ -363,14 +387,16 @@
/obj/structure/table/holotable
flags = NODECONSTRUCT
- canSmoothWith = list(/obj/structure/table/holotable)
+ canSmoothWith = list(SMOOTH_GROUP_TABLES)
/obj/structure/table/holotable/wood
name = "wooden table"
desc = "A square piece of wood standing on four wooden legs. It can not move."
icon = 'icons/obj/smooth_structures/wood_table.dmi'
- icon_state = "wood_table"
- canSmoothWith = list(/obj/structure/table/holotable/wood)
+ icon_state = "wood_table-0"
+ base_icon_state = "wood_table"
+ smoothing_groups = list(SMOOTH_GROUP_WOOD_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES
+ canSmoothWith = list(SMOOTH_GROUP_WOOD_TABLES)
/obj/structure/chair/stool/holostool
flags = NODECONSTRUCT
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 76f0de8b269..04da69784eb 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -210,7 +210,7 @@
anchored = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags = NODECONSTRUCT
- var/base_icon_state = "body_scanner_0"
+ base_icon_state = "body_scanner_0"
var/occupied_icon_state = "body_scanner_1"
var/on_store_message = "has entered long-term storage."
var/on_store_name = "Cryogenic Oversight"
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index c8b19751c68..faa249c8035 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -108,14 +108,16 @@
name = "sandbags"
desc = "Bags of sand. Self explanatory."
icon = 'icons/obj/smooth_structures/sandbags.dmi'
- icon_state = "sandbags"
+ icon_state = "sandbags-0"
+ base_icon_state = "sandbags"
max_integrity = 280
proj_pass_rate = 20
pass_flags = LETPASSTHROW
bar_material = SAND
climbable = TRUE
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/barricade/sandbags, /turf/simulated/wall, /turf/simulated/wall/r_wall, /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/simulated/wall/rust, /turf/simulated/wall/r_wall/rust, /obj/structure/barricade/security)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SANDBAGS)
+ canSmoothWith = list(SMOOTH_GROUP_SANDBAGS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SECURITY_BARRICADE)
stacktype = null
/obj/structure/barricade/security
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 478d5abc02d..c0d163e59c2 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -60,6 +60,7 @@ GLOBAL_LIST_EMPTY(airlock_overlays)
siemens_strength = 1
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
rad_insulation = RAD_MEDIUM_INSULATION
+ smoothing_groups = list(SMOOTH_GROUP_AIRLOCK)
var/security_level = 0 //How much are wires secured
var/aiControlDisabled = AICONTROLDISABLED_OFF
var/hackProof = FALSE // if TRUE, this door can't be hacked by the AI
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 6ef46e63d85..93ef91a8011 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -6,6 +6,7 @@
var/buckle_offset = 0
var/max_buckled_mobs = 1
var/buckle_prevents_pull = FALSE
+ var/can_be_unanchored = FALSE
//Interaction
/atom/movable/attack_hand(mob/living/user)
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index 17f37c4f478..7f112658a23 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -43,13 +43,23 @@
layer = TURF_LAYER
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt"
- canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /obj/structure/falsewall)
- smooth = SMOOTH_MORE
+ base_icon_state = "dirt"
+ smoothing_flags = NONE
+ smoothing_groups = list(SMOOTH_GROUP_CLEANABLE_DIRT)
+ canSmoothWith = list(SMOOTH_GROUP_CLEANABLE_DIRT, SMOOTH_GROUP_WALLS)
mouse_opacity = FALSE
-/obj/effect/decal/cleanable/dirt/Initialize(mapload)
+/obj/effect/decal/cleanable/dirt/Initialize()
. = ..()
- icon_state = ""
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
+
+/obj/effect/decal/cleanable/dirt/Destroy()
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ return ..()
/obj/effect/decal/cleanable/dirt/blackpowder
name = "black powder"
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 6f18d7a9588..73d4290f3fb 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -66,11 +66,11 @@
return TRUE
if(random_icon_states && length(src.random_icon_states) > 0)
src.icon_state = pick(src.random_icon_states)
- if(smooth)
- queue_smooth(src)
- queue_smooth_neighbors(src)
+ if(smoothing_flags)
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
/obj/effect/decal/cleanable/Destroy()
- if(smooth)
- queue_smooth_neighbors(src)
+ if(smoothing_flags)
+ QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index c24432f9644..afd3ad54a11 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -24,7 +24,7 @@
var/safety = TRUE //if you can zap people with the defibs on harm mode
var/combat = FALSE //can we revive through space suits?
var/heart_attack = FALSE //can it give instant heart attacks when zapped on harm intent with combat?
- var/base_icon_state = "defibpaddles"
+ base_icon_state = "defibpaddles"
var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles
/obj/item/defibrillator/get_cell()
@@ -297,7 +297,7 @@
var/revivecost = 1000
var/cooldown = FALSE
var/busy = FALSE
- var/base_icon_state = "defibpaddles"
+ base_icon_state = "defibpaddles"
var/obj/item/defibrillator/defib
/obj/item/twohanded/shockpaddles/New(mainunit)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 96caf288d2d..7f982c601fe 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -9,11 +9,12 @@
/obj/structure/New()
..()
- if(smooth)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
- queue_smooth(src)
- queue_smooth_neighbors(src)
- icon_state = ""
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ if(smoothing_flags & SMOOTH_CORNERS)
+ icon_state = ""
if(climbable)
verbs += /obj/structure/proc/climb_on
if(SSticker)
@@ -27,10 +28,10 @@
/obj/structure/Destroy()
if(SSticker)
GLOB.cameranet.updateVisibility(src)
- if(smooth)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
var/turf/T = get_turf(src)
spawn(0)
- queue_smooth_neighbors(T)
+ QUEUE_SMOOTH_NEIGHBORS(T)
return ..()
/obj/structure/proc/climb_on()
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 34eda470895..7ee548d2d39 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -42,13 +42,15 @@
name = "resin"
desc = "Looks like some kind of thick resin."
icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
- icon_state = "resin"
+ icon_state = "resin_wall-0"
+ base_icon_state = "resin_wall"
density = TRUE
opacity = TRUE
anchored = TRUE
- canSmoothWith = list(/obj/structure/alien/resin)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN)
+ canSmoothWith = list(SMOOTH_GROUP_ALIEN_RESIN)
max_integrity = 200
- smooth = SMOOTH_TRUE
var/resintype = null
/obj/structure/alien/resin/Initialize()
@@ -72,9 +74,10 @@
name = "resin wall"
desc = "Thick resin solidified into a wall."
icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
- icon_state = "wall0" //same as resin, but consistency ho!
- resintype = "wall"
- canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
+ icon_state = "resin_wall-0"
+ base_icon_state = "resin_wall"
+ smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)
/obj/structure/alien/resin/wall/BlockSuperconductivity()
return 1
@@ -88,11 +91,13 @@
name = "resin membrane"
desc = "Resin just thin enough to let light pass through."
icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
- icon_state = "membrane0"
+ icon_state = "resin_membrane-0"
+ base_icon_state = "resin_membrane"
opacity = 0
max_integrity = 160
resintype = "membrane"
- canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
+ smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)
/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
@@ -112,10 +117,16 @@
desc = "A thick resin surface covers the floor."
anchored = TRUE
density = FALSE
- layer = TURF_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
- icon_state = "weeds"
+ icon = 'icons/obj/smooth_structures/alien/weeds1.dmi'
+ icon_state = "weeds1-0"
+ base_icon_state = "weeds1"
max_integrity = 15
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WEEDS)
+ canSmoothWith = list(SMOOTH_GROUP_ALIEN_WEEDS, SMOOTH_GROUP_WALLS)
+ transform = matrix(1, 0, -4, 0, 1, -4)
var/obj/structure/alien/weeds/node/linked_node = null
var/static/list/weedImageCache
@@ -128,15 +139,12 @@
return
if(icon_state == "weeds")
icon_state = pick("weeds", "weeds1", "weeds2")
- fullUpdateWeedOverlays()
spawn(rand(150, 200))
if(src)
Life()
/obj/structure/alien/weeds/Destroy()
- var/turf/T = loc
- for(var/obj/structure/alien/weeds/W in range(1,T))
- W.updateWeedOverlays()
+ QUEUE_SMOOTH_NEIGHBORS(src)
linked_node = null
return ..()
@@ -162,45 +170,13 @@
if(exposed_temperature > 300)
take_damage(5, BURN, 0, 0)
-/obj/structure/alien/weeds/proc/updateWeedOverlays()
-
- overlays.Cut()
-
- if(!weedImageCache || !weedImageCache.len)
- weedImageCache = list()
- weedImageCache.len = 4
- weedImageCache[WEED_NORTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_n", layer=2.11, pixel_y = -32)
- weedImageCache[WEED_SOUTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_s", layer=2.11, pixel_y = 32)
- weedImageCache[WEED_EAST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_e", layer=2.11, pixel_x = -32)
- weedImageCache[WEED_WEST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_w", layer=2.11, pixel_x = 32)
-
- var/turf/N = get_step(src, NORTH)
- var/turf/S = get_step(src, SOUTH)
- var/turf/E = get_step(src, EAST)
- var/turf/W = get_step(src, WEST)
- if(!locate(/obj/structure/alien) in N.contents)
- if(istype(N, /turf/simulated/floor))
- overlays += weedImageCache[WEED_SOUTH_EDGING]
- if(!locate(/obj/structure/alien) in S.contents)
- if(istype(S, /turf/simulated/floor))
- overlays += weedImageCache[WEED_NORTH_EDGING]
- if(!locate(/obj/structure/alien) in E.contents)
- if(istype(E, /turf/simulated/floor))
- overlays += weedImageCache[WEED_WEST_EDGING]
- if(!locate(/obj/structure/alien) in W.contents)
- if(istype(W, /turf/simulated/floor))
- overlays += weedImageCache[WEED_EAST_EDGING]
-
-
-/obj/structure/alien/weeds/proc/fullUpdateWeedOverlays()
- for(var/obj/structure/alien/weeds/W in range(1,src))
- W.updateWeedOverlays()
-
//Weed nodes
/obj/structure/alien/weeds/node
name = "glowing resin"
desc = "Blue bioluminescence shines from beneath the surface."
- icon_state = "weednode"
+ icon = 'icons/obj/smooth_structures/alien/weednode.dmi'
+ icon_state = "weednode-0"
+ base_icon_state = "weednode"
light_range = 1
var/node_range = NODERANGE
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 5ee5518af11..3fcadd33a17 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -11,7 +11,8 @@
desc = "A huge chunk of metal used to seperate rooms."
anchored = TRUE
icon = 'icons/turf/walls/wall.dmi'
- icon_state = "wall"
+ icon_state = "wall-0"
+ base_icon_state = "wall"
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
rad_insulation = RAD_MEDIUM_INSULATION
@@ -25,15 +26,9 @@
opacity = TRUE
max_integrity = 100
- canSmoothWith = list(
- /turf/simulated/wall,
- /turf/simulated/wall/r_wall,
- /obj/structure/falsewall,
- /obj/structure/falsewall/brass,
- /obj/structure/falsewall/reinforced, // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS. //because we do smooth with real r-walls now
- /turf/simulated/wall/rust,
- /turf/simulated/wall/r_wall/rust)
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS)
/obj/structure/falsewall/Initialize(mapload)
. = ..()
@@ -72,39 +67,41 @@
opening = 1
if(density)
- do_the_flick()
- sleep(4)
+ flick("fwall_opening", src)
density = 0
set_opacity(0)
- update_icon(0)
+ update_icon()
else
var/srcturf = get_turf(src)
for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield
opening = 0
return
- do_the_flick()
+ flick("fwall_closing", src)
density = 1
- sleep(4)
set_opacity(1)
update_icon()
air_update_turf(1)
opening = 0
+ update_icon()
-/obj/structure/falsewall/proc/do_the_flick()
- if(density)
- smooth = SMOOTH_FALSE
- clear_smooth_overlays()
- flick("fwall_opening", src)
- else
- flick("fwall_closing", src)
/obj/structure/falsewall/update_icon()
- if(density)
- icon_state = initial(icon_state)
- smooth = SMOOTH_TRUE
- queue_smooth(src)
+ if(opening)
+ if(density)
+ icon_state = "fwall_opening"
+ smoothing_flags = NONE
+ clear_smooth_overlays()
+ else
+ icon_state = "fwall_closing"
else
- icon_state = "fwall_open"
+ if(density)
+ icon_state = initial(icon_state)
+ smoothing_flags = SMOOTH_CORNERS
+ icon_state = "[base_icon_state]-[smoothing_junction]"
+ smoothing_flags = SMOOTH_BITMASK
+ QUEUE_SMOOTH(src)
+ else
+ icon_state = "fwall_open"
/obj/structure/falsewall/proc/ChangeToWall(delete = TRUE)
var/turf/T = get_turf(src)
@@ -165,9 +162,11 @@
name = "reinforced wall"
desc = "A huge chunk of reinforced metal used to seperate rooms."
icon = 'icons/turf/walls/reinforced_wall.dmi'
- icon_state = "r_wall"
+ icon_state = "reinforced_wall-0"
+ base_icon_state = "reinforced_wall"
walltype = /turf/simulated/wall/r_wall
mineral = /obj/item/stack/sheet/plasteel
+ smoothing_flags = SMOOTH_BITMASK
/obj/structure/falsewall/reinforced/examine_status(mob/user)
. = ..()
@@ -188,12 +187,15 @@
name = "uranium wall"
desc = "A wall with uranium plating. This is probably a bad idea."
icon = 'icons/turf/walls/uranium_wall.dmi'
- icon_state = "uranium"
+ icon_state = "uranium_wall-0"
+ base_icon_state = "uranium_wall"
mineral = /obj/item/stack/sheet/mineral/uranium
walltype = /turf/simulated/wall/mineral/uranium
var/active = null
var/last_event = 0
- canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS)
/obj/structure/falsewall/uranium/attackby(obj/item/W as obj, mob/user as mob, params)
radiate()
@@ -220,28 +222,37 @@
name = "gold wall"
desc = "A wall with gold plating. Swag!"
icon = 'icons/turf/walls/gold_wall.dmi'
- icon_state = "gold"
+ icon_state = "gold_wall-0"
+ base_icon_state = "gold_wall"
mineral = /obj/item/stack/sheet/mineral/gold
walltype = /turf/simulated/wall/mineral/gold
- canSmoothWith = list(/obj/structure/falsewall/gold, /turf/simulated/wall/mineral/gold)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_GOLD_WALLS)
/obj/structure/falsewall/silver
name = "silver wall"
desc = "A wall with silver plating. Shiny."
icon = 'icons/turf/walls/silver_wall.dmi'
- icon_state = "silver"
+ icon_state = "silver_wall-0"
+ base_icon_state = "silver_wall"
mineral = /obj/item/stack/sheet/mineral/silver
walltype = /turf/simulated/wall/mineral/silver
- canSmoothWith = list(/obj/structure/falsewall/silver, /turf/simulated/wall/mineral/silver)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SILVER_WALLS)
/obj/structure/falsewall/diamond
name = "diamond wall"
desc = "A wall with diamond plating. You monster."
icon = 'icons/turf/walls/diamond_wall.dmi'
- icon_state = "diamond"
+ icon_state = "diamond_wall-0"
+ base_icon_state = "diamond_wall"
mineral = /obj/item/stack/sheet/mineral/diamond
walltype = /turf/simulated/wall/mineral/diamond
- canSmoothWith = list(/obj/structure/falsewall/diamond, /turf/simulated/wall/mineral/diamond)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_DIAMOND_WALLS)
max_integrity = 800
@@ -249,10 +260,13 @@
name = "plasma wall"
desc = "A wall with plasma plating. This is definately a bad idea."
icon = 'icons/turf/walls/plasma_wall.dmi'
- icon_state = "plasma"
+ icon_state = "plasma_wall-0"
+ base_icon_state = "plasma_wall"
mineral = /obj/item/stack/sheet/mineral/plasma
walltype = /turf/simulated/wall/mineral/plasma
- canSmoothWith = list(/obj/structure/falsewall/plasma, /turf/simulated/wall/mineral/plasma, /turf/simulated/wall/mineral/alien)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS)
/obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
if(is_hot(W) > 300)
@@ -278,85 +292,110 @@
/obj/structure/falsewall/alien
name = "alien wall"
desc = "A strange-looking alien wall."
- icon = 'icons/turf/walls/plasma_wall.dmi'
- icon_state = "plasma"
+ icon = 'icons/turf/walls/abductor_wall.dmi'
+ icon_state = "abductor_wall-0"
+ base_icon_state = "abductor_wall"
mineral = /obj/item/stack/sheet/mineral/abductor
walltype = /turf/simulated/wall/mineral/abductor
- canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
/obj/structure/falsewall/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
- icon_state = "bananium"
+ icon_state = "bananium_wall-0"
+ base_icon_state = "bananium_wall"
mineral = /obj/item/stack/sheet/mineral/bananium
walltype = /turf/simulated/wall/mineral/bananium
- canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/simulated/wall/mineral/bananium)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_BANANIUM_WALLS)
/obj/structure/falsewall/sandstone
name = "sandstone wall"
desc = "A wall with sandstone plating."
icon = 'icons/turf/walls/sandstone_wall.dmi'
- icon_state = "sandstone"
+ icon_state = "sandstone_wall-0"
+ base_icon_state = "sandstone_wall"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/simulated/wall/mineral/sandstone
- canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SANDSTONE_WALLS)
/obj/structure/falsewall/wood
name = "wooden wall"
desc = "A wall with wooden plating. Stiff."
icon = 'icons/turf/walls/wood_wall.dmi'
- icon_state = "wood"
+ icon_state = "wood_wall-0"
+ base_icon_state = "wood_wall"
mineral = /obj/item/stack/sheet/wood
walltype = /turf/simulated/wall/mineral/wood
- canSmoothWith = list(/obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
/obj/structure/falsewall/iron
name = "rough metal wall"
desc = "A wall with rough metal plating."
icon = 'icons/turf/walls/iron_wall.dmi'
- icon_state = "iron"
+ icon_state = "iron_wall-0"
+ base_icon_state = "iron_wall"
mineral = /obj/item/stack/rods
mineral_amount = 5
walltype = /turf/simulated/wall/mineral/iron
- canSmoothWith = list(/obj/structure/falsewall/iron, /turf/simulated/wall/mineral/iron)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_IRON_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_IRON_WALLS)
/obj/structure/falsewall/abductor
name = "alien wall"
desc = "A wall with alien alloy plating."
icon = 'icons/turf/walls/abductor_wall.dmi'
- icon_state = "abductor"
+ icon_state = "abductor_wall-0"
+ base_icon_state = "abductor_wall"
mineral = /obj/item/stack/sheet/mineral/abductor
walltype = /turf/simulated/wall/mineral/abductor
- canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
/obj/structure/falsewall/titanium
desc = "A light-weight titanium wall used in shuttles."
- icon = 'icons/turf/walls/shuttle_wall.dmi'
- icon_state = "shuttle"
+ icon = 'icons/turf/walls/plastinum_wall.dmi'
+ icon_state = "plastinum_wall-0"
+ base_icon_state = "plastinum_wall"
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/simulated/wall/mineral/titanium
- smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
/obj/structure/falsewall/plastitanium
desc = "An evil wall of plasma and titanium."
icon = 'icons/turf/walls/plastitanium_wall.dmi'
- icon_state = "shuttle"
+ icon_state = "plastitanium_wall-0"
+ base_icon_state = "plastitanium_wall"
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/simulated/wall/mineral/plastitanium
- smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
/obj/structure/falsewall/brass
name = "clockwork wall"
desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
icon = 'icons/turf/walls/clockwork_wall.dmi'
- icon_state = "clockwork_wall"
+ icon_state = "clockwork_wall-0"
+ base_icon_state = "clockwork_wall"
resistance_flags = FIRE_PROOF | ACID_PROOF
mineral_amount = 1
- canSmoothWith = list(/obj/effect/clockwork/overlay/wall, /obj/structure/falsewall/brass)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL)
+ canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL)
girder_type = /obj/structure/clockwork/wall_gear/displaced
walltype = /turf/simulated/wall/clockwork
mineral = /obj/item/stack/tile/brass
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index f43c3c2c1c9..ff4b8c98132 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -2,7 +2,8 @@
name = "lattice"
desc = "A lightweight support lattice."
icon = 'icons/obj/smooth_structures/lattice.dmi'
- icon_state = "lattice"
+ icon_state = "lattice-255"
+ base_icon_state = "lattice"
density = FALSE
anchored = TRUE
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 50)
@@ -10,11 +11,9 @@
layer = LATTICE_LAYER //under pipes
plane = FLOOR_PLANE
var/number_of_rods = 1
- canSmoothWith = list(/obj/structure/lattice,
- /turf/simulated/floor,
- /turf/simulated/wall,
- /obj/structure/falsewall)
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_LATTICE)
+ canSmoothWith = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_FLOOR, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TURF, SMOOTH_GROUP_WINDOW_FULLTILE)
/obj/structure/lattice/Initialize(mapload)
. = ..()
@@ -70,10 +69,12 @@
name = "catwalk"
desc = "A catwalk for easier EVA maneuvering and cable placement."
icon = 'icons/obj/smooth_structures/catwalk.dmi'
- icon_state = "catwalk"
+ icon_state = "catwalk-0"
+ base_icon_state = "catwalk"
number_of_rods = 2
- smooth = SMOOTH_TRUE
- canSmoothWith = null
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_FLOOR)
+ canSmoothWith = list(SMOOTH_GROUP_LATTICE)
/obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
to_chat(user, "The supporting rods look like they could be cut.")
@@ -93,11 +94,8 @@
/obj/structure/lattice/catwalk/clockwork
name = "clockwork catwalk"
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
- canSmoothWith = list(/obj/structure/lattice,
- /turf/simulated/floor,
- /turf/simulated/wall,
- /obj/structure/falsewall)
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_CORNERS
+ smoothing_groups = null
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 17645de3c78..3a1c7ad85f3 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -4,9 +4,13 @@
name = "alien nest"
desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
icon = 'icons/mob/alien.dmi'
- icon_state = "nest"
+ icon_state = "nest-0"
+ base_icon_state = "nest"
max_integrity = 120
var/image/nest_overlay
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_ALIEN_NEST)
+ canSmoothWith = list(SMOOTH_GROUP_ALIEN_NEST)
comfort = 0
flags = NODECONSTRUCT
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 6dd727c6bbd..b06eca9ef90 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -16,7 +16,8 @@
name = "table"
desc = "A square piece of metal standing on four metal legs. It can not move."
icon = 'icons/obj/smooth_structures/table.dmi'
- icon_state = "table"
+ icon_state = "table-0"
+ base_icon_state = "table"
density = TRUE
anchored = TRUE
layer = TABLE_LAYER
@@ -24,8 +25,9 @@
climbable = TRUE
max_integrity = 100
integrity_failure = 30
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_TABLES)
+ canSmoothWith = list(SMOOTH_GROUP_TABLES)
var/frame = /obj/structure/table_frame
var/framestack = /obj/item/stack/rods
var/buildstack = /obj/item/stack/sheet/metal
@@ -48,10 +50,10 @@
return "The top is screwed on, but the main bolts are also visible."
/obj/structure/table/update_icon()
- if(smooth && !flipped)
+ if((smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) && !flipped)
icon_state = ""
- queue_smooth(src)
- queue_smooth_neighbors(src)
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
if(flipped)
clear_smooth_overlays()
@@ -339,7 +341,7 @@
if(dir != NORTH)
layer = 5
flipped = 1
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
flags |= ON_BORDER
for(var/D in list(turn(direction, 90), turn(direction, -90)))
if(locate(/obj/structure/table,get_step(src,D)))
@@ -365,7 +367,7 @@
layer = initial(layer)
flipped = 0
- smooth = initial(smooth)
+ smoothing_flags = initial(smoothing_flags)
flags &= ~ON_BORDER
for(var/D in list(turn(dir, 90), turn(dir, -90)))
if(locate(/obj/structure/table,get_step(src,D)))
@@ -384,9 +386,11 @@
name = "glass table"
desc = "Looks fragile. You should totally flip it. It is begging for it."
icon = 'icons/obj/smooth_structures/glass_table.dmi'
- icon_state = "glass_table"
+ icon_state = "glass_table-0"
+ base_icon_state = "glass_table"
buildstack = /obj/item/stack/sheet/glass
- canSmoothWith = null
+ smoothing_groups = list(SMOOTH_GROUP_GLASS_TABLES)
+ canSmoothWith = list(SMOOTH_GROUP_GLASS_TABLES)
max_integrity = 70
resistance_flags = ACID_PROOF
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
@@ -469,12 +473,14 @@
name = "wooden table"
desc = "Do not apply fire to this. Rumour says it burns easily."
icon = 'icons/obj/smooth_structures/wood_table.dmi'
- icon_state = "wood_table"
+ icon_state = "wood_table-0"
+ base_icon_state = "wood_table"
frame = /obj/structure/table_frame/wood
framestack = /obj/item/stack/sheet/wood
buildstack = /obj/item/stack/sheet/wood
max_integrity = 70
- canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)
+ smoothing_groups = list(SMOOTH_GROUP_WOOD_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES
+ canSmoothWith = list(SMOOTH_GROUP_WOOD_TABLES)
resistance_flags = FLAMMABLE
/obj/structure/table/wood/narsie_act(total_override = TRUE)
@@ -485,7 +491,8 @@
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'icons/obj/smooth_structures/poker_table.dmi'
- icon_state = "poker_table"
+ icon_state = "poker_table-0"
+ base_icon_state = "poker_table"
buildstack = /obj/item/stack/tile/carpet
/obj/structure/table/wood/poker/narsie_act()
@@ -499,84 +506,76 @@
name = "fancy table"
desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth."
icon = 'icons/obj/smooth_structures/fancy_table.dmi'
- icon_state = "fancy_table"
+ icon_state = "fancy_table-0"
+ base_icon_state = "fancy_table"
frame = /obj/structure/table_frame
framestack = /obj/item/stack/rods
buildstack = /obj/item/stack/tile/carpet
- canSmoothWith = list(/obj/structure/table/wood/fancy,
- /obj/structure/table/wood/fancy/black,
- /obj/structure/table/wood/fancy/blue,
- /obj/structure/table/wood/fancy/cyan,
- /obj/structure/table/wood/fancy/green,
- /obj/structure/table/wood/fancy/orange,
- /obj/structure/table/wood/fancy/purple,
- /obj/structure/table/wood/fancy/red,
- /obj/structure/table/wood/fancy/royalblack,
- /obj/structure/table/wood/fancy/royalblue)
- var/smooth_icon = 'icons/obj/smooth_structures/fancy_table.dmi'
+ smoothing_groups = list(SMOOTH_GROUP_FANCY_WOOD_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES or SMOOTH_GROUP_WOOD_TABLES
+ canSmoothWith = list(SMOOTH_GROUP_FANCY_WOOD_TABLES)
/obj/structure/table/wood/fancy/flip(direction)
return FALSE
/obj/structure/table/wood/fancy/Initialize()
. = ..()
- icon = smooth_icon
+ QUEUE_SMOOTH(src)
/obj/structure/table/wood/fancy/black
- icon_state = "fancy_table_black"
+ icon_state = "fancy_table_black-0"
+ base_icon_state = "fancy_table_black"
buildstack = /obj/item/stack/tile/carpet/black
icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
/obj/structure/table/wood/fancy/blue
- icon_state = "fancy_table_blue"
+ icon_state = "fancy_table_blue-0"
+ base_icon_state = "fancy_table_blue"
buildstack = /obj/item/stack/tile/carpet/blue
icon = 'icons/obj/smooth_structures/fancy_table_blue.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_blue.dmi'
/obj/structure/table/wood/fancy/cyan
- icon_state = "fancy_table_cyan"
+ icon_state = "fancy_table_cyan-0"
+ base_icon_state = "fancy_table_cyan"
buildstack = /obj/item/stack/tile/carpet/cyan
icon = 'icons/obj/smooth_structures/fancy_table_cyan.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_cyan.dmi'
/obj/structure/table/wood/fancy/green
- icon_state = "fancy_table_green"
+ icon_state = "fancy_table_green-0"
+ base_icon_state = "fancy_table_green"
buildstack = /obj/item/stack/tile/carpet/green
icon = 'icons/obj/smooth_structures/fancy_table_green.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_green.dmi'
/obj/structure/table/wood/fancy/orange
- icon_state = "fancy_table_orange"
+ icon_state = "fancy_table_orange-0"
+ base_icon_state = "fancy_table_orange"
buildstack = /obj/item/stack/tile/carpet/orange
icon = 'icons/obj/smooth_structures/fancy_table_orange.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_orange.dmi'
/obj/structure/table/wood/fancy/purple
- icon_state = "fancy_table_purple"
+ icon_state = "fancy_table_purple-0"
+ base_icon_state = "fancy_table_purple"
buildstack = /obj/item/stack/tile/carpet/purple
icon = 'icons/obj/smooth_structures/fancy_table_purple.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_purple.dmi'
/obj/structure/table/wood/fancy/red
- icon_state = "fancy_table_red"
+ icon_state = "fancy_table_red-0"
+ base_icon_state = "fancy_table_red"
buildstack = /obj/item/stack/tile/carpet/red
icon = 'icons/obj/smooth_structures/fancy_table_red.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_red.dmi'
/obj/structure/table/wood/fancy/royalblack
- icon_state = "fancy_table_royalblack"
+ icon_state = "fancy_table_royalblack-0"
+ base_icon_state = "fancy_table_royalblack"
buildstack = /obj/item/stack/tile/carpet/royalblack
icon = 'icons/obj/smooth_structures/fancy_table_royalblack.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblack.dmi'
/obj/structure/table/wood/fancy/royalblue
- icon_state = "fancy_table_royalblue"
+ icon_state = "fancy_table_royalblue-0"
+ base_icon_state = "fancy_table_royalblue"
buildstack = /obj/item/stack/tile/carpet/royalblue
icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi'
- smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi'
/*
* Reinforced tables
@@ -585,10 +584,11 @@
name = "reinforced table"
desc = "A reinforced version of the four legged table."
icon = 'icons/obj/smooth_structures/reinforced_table.dmi'
- icon_state = "r_table"
+ icon_state = "reinforced_table-0"
+ base_icon_state = "reinforced_table"
deconstruction_ready = FALSE
buildstack = /obj/item/stack/sheet/plasteel
- canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
+ canSmoothWith = list(SMOOTH_GROUP_TABLES)
max_integrity = 200
integrity_failure = 50
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
@@ -618,14 +618,16 @@
name = "brass table"
desc = "A solid, slightly beveled brass table."
icon = 'icons/obj/smooth_structures/brass_table.dmi'
- icon_state = "brass_table"
+ icon_state = "brass_table-0"
+ base_icon_state = "brass_table"
resistance_flags = FIRE_PROOF | ACID_PROOF
frame = /obj/structure/table_frame/brass
framestack = /obj/item/stack/tile/brass
buildstack = /obj/item/stack/tile/brass
framestackamount = 1
buildstackamount = 1
- canSmoothWith = list(/obj/structure/table/reinforced/brass)
+ smoothing_groups = list(SMOOTH_GROUP_BRASS_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES
+ canSmoothWith = list(SMOOTH_GROUP_BRASS_TABLES)
/obj/structure/table/reinforced/brass/narsie_act()
take_damage(rand(15, 45), BRUTE)
@@ -638,7 +640,9 @@
name = "surgical tray"
desc = "A small metal tray with wheels."
anchored = FALSE
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
+ smoothing_groups = null
+ canSmoothWith = null
icon = 'icons/obj/stationobjs.dmi'
icon_state = "tray"
buildstack = /obj/item/stack/sheet/mineral/titanium
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 3da55a8f17e..53966b1725b 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -451,8 +451,8 @@
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
update_icon()
- if(smooth)
- queue_smooth_neighbors(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
/obj/structure/window/update_icon()
if(!QDELETED(src))
@@ -461,8 +461,8 @@
var/ratio = obj_integrity / max_integrity
ratio = CEILING(ratio * 4, 1) * 25
- if(smooth)
- queue_smooth(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH(src)
cut_overlay(crack_overlay)
if(ratio > 75)
@@ -613,27 +613,28 @@
level = 3
fulltile = TRUE
flags = PREVENT_CLICK_UNDER
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE)
/obj/structure/window/full/basic
desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
icon = 'icons/obj/smooth_structures/window.dmi'
- icon_state = "window"
+ icon_state = "window-0"
+ base_icon_state = "window"
max_integrity = 50
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
/obj/structure/window/full/plasmabasic
name = "plasma window"
desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
icon = 'icons/obj/smooth_structures/plasma_window.dmi'
- icon_state = "plasmawindow"
+ icon_state = "plasma_window-0"
+ base_icon_state = "plasma_window"
glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
heat_resistance = 32000
max_integrity = 300
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
explosion_block = 1
armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, BIO = 100, RAD = 100, FIRE = 99, ACID = 100)
rad_insulation = RAD_NO_INSULATION
@@ -642,12 +643,11 @@
name = "reinforced plasma window"
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
- icon_state = "rplasmawindow"
+ icon_state = "rplasma_window-0"
+ base_icon_state = "rplasma_window"
glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
reinf = TRUE
max_integrity = 1000
explosion_block = 2
@@ -661,9 +661,8 @@
name = "reinforced window"
desc = "It looks rather strong. Might take a few good hits to shatter it."
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
- icon_state = "r_window"
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
+ icon_state = "reinforced_window-0"
+ base_icon_state = "reinforced_window"
max_integrity = 100
reinf = TRUE
heat_resistance = 1600
@@ -682,26 +681,29 @@
name = "tinted window"
desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
icon = 'icons/obj/smooth_structures/tinted_window.dmi'
- icon_state = "tinted_window"
+ icon_state = "tinted_window-0"
+ base_icon_state = "tinted_window"
opacity = 1
/obj/structure/window/full/reinforced/ice
icon = 'icons/obj/smooth_structures/rice_window.dmi'
- icon_state = "ice_window"
+ icon_state = "rice_window-0" //Welcome to the rice fields, motherfucker.
+ base_icon_state = "rice_window"
max_integrity = 150
/obj/structure/window/full/shuttle
name = "shuttle window"
desc = "A reinforced, air-locked pod window."
icon = 'icons/obj/smooth_structures/shuttle_window.dmi'
- icon_state = "shuttle_window"
+ icon_state = "shuttle_window-0"
+ base_icon_state = "shuttle_window"
max_integrity = 100
reinf = TRUE
heat_resistance = 1600
explosion_block = 3
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, RAD = 100, FIRE = 80, ACID = 100)
- smooth = SMOOTH_TRUE
- canSmoothWith = null
+ smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS)
glass_type = /obj/item/stack/sheet/titaniumglass
/obj/structure/window/full/shuttle/narsie_act()
@@ -714,17 +716,17 @@
name = "plastitanium window"
desc = "An evil looking window of plasma and titanium."
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
- icon_state = "plastitanium_window"
+ icon_state = "plastitanium_window-0"
+ base_icon_state = "plastitanium_window"
max_integrity = 100
reinf = TRUE
heat_resistance = 1600
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, RAD = 100, FIRE = 80, ACID = 100)
rad_insulation = RAD_HEAVY_INSULATION
- smooth = SMOOTH_TRUE
- canSmoothWith = null
explosion_block = 3
glass_type = /obj/item/stack/sheet/plastitaniumglass
- canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
+ smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
/obj/structure/window/reinforced/clockwork
name = "brass window"
@@ -761,9 +763,11 @@
animate(src, color = previouscolor, time = 8)
/obj/structure/window/reinforced/clockwork/fulltile
- icon_state = "clockwork_window"
- smooth = SMOOTH_TRUE
- canSmoothWith = null
+ icon_state = "clockwork_window-0"
+ base_icon_state = "clockwork_window"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS)
fulltile = TRUE
flags = PREVENT_CLICK_UNDER
dir = FULLTILE_WINDOW_DIR
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 80325022e05..09b7babbef2 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -106,7 +106,7 @@
/turf/simulated/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
. = ..()
- queue_smooth_neighbors(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
/turf/simulated/proc/is_shielded()
diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index ec03b67c425..959dab35e1b 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -2,10 +2,12 @@
name = "chasm"
desc = "Watch your step."
baseturf = /turf/simulated/floor/chasm
- smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
icon = 'icons/turf/floors/Chasms.dmi'
- icon_state = "smooth"
- canSmoothWith = list(/turf/simulated/floor/chasm)
+ icon_state = "chasms-255"
+ base_icon_state = "chasms"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_TURF_CHASM)
+ canSmoothWith = list(SMOOTH_GROUP_TURF_CHASM)
density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf
var/static/list/falling_atoms = list() //Atoms currently falling into the chasm
var/static/list/forbidden_types = typecacheof(list(
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 86a1e119dad..58f9052db92 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -44,21 +44,21 @@
/turf/simulated/floor/grass
name = "grass patch"
- icon_state = "grass1"
+ icon = 'icons/turf/floors/grass.dmi'
+ icon_state = "grass-0"
+ base_icon_state = "grass"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS)
+ canSmoothWith = list(SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS)
+ transform = matrix(1, 0, -9, 0, 1, -9) //Yes, these sprites are 50x50px, big grass control the industry
+ layer = ABOVE_OPEN_TURF_LAYER
+ broken_states = list("damaged")
floor_tile = /obj/item/stack/tile/grass
- broken_states = list("sand")
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-/turf/simulated/floor/grass/Initialize(mapload)
- . = ..()
- update_icon()
-
-/turf/simulated/floor/grass/update_icon()
- icon_state = "grass[pick("1","2","3","4")]"
-
/turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params)
if(..())
return
@@ -68,17 +68,37 @@
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
make_plating()
+/turf/simulated/floor/grass/jungle
+ name = "jungle grass"
+ icon = 'icons/turf/floors/junglegrass.dmi'
+ icon_state = "junglegrass-0"
+ base_icon_state = "junglegrass"
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS)
+
+/turf/simulated/floor/grass/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite
+ smoothing_flags = null
+ smoothing_groups = null
+ canSmoothWith = null
+ layer = GRASS_UNDER_LAYER
+
+/turf/simulated/floor/grass/jungle/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite
+ smoothing_flags = null
+ smoothing_groups = null
+ canSmoothWith = null
+ layer = GRASS_UNDER_LAYER
//Carpets
/turf/simulated/floor/carpet
name = "carpet"
icon = 'icons/turf/floors/carpet.dmi'
- icon_state = "carpet"
+ icon_state = "carpet-255"
+ base_icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
- smooth = SMOOTH_TRUE
- canSmoothWith = null
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET)
footstep = FOOTSTEP_CARPET
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
@@ -92,12 +112,16 @@
if(!..())
return 0
if(!broken && !burnt)
- if(smooth)
- queue_smooth(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH(src)
else
make_plating()
- if(smooth)
- queue_smooth_neighbors(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
+
+//Carpet variant for mapping aid, functionally the same as parent after smoothing.
+/turf/simulated/floor/carpet/lone
+ icon_state = "carpet-0"
/turf/simulated/floor/carpet/break_tile()
broken = 1
@@ -113,47 +137,56 @@
/turf/simulated/floor/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
floor_tile = /obj/item/stack/tile/carpet/black
- canSmoothWith = list(/turf/simulated/floor/carpet/black)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_BLACK)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_BLACK)
/turf/simulated/floor/carpet/blue
icon = 'icons/turf/floors/carpet_blue.dmi'
floor_tile = /obj/item/stack/tile/carpet/blue
- canSmoothWith = list(/turf/simulated/floor/carpet/blue)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_BLUE)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_BLUE)
/turf/simulated/floor/carpet/cyan
icon = 'icons/turf/floors/carpet_cyan.dmi'
floor_tile = /obj/item/stack/tile/carpet/cyan
- canSmoothWith = list(/turf/simulated/floor/carpet/cyan)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_CYAN)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_CYAN)
/turf/simulated/floor/carpet/green
icon = 'icons/turf/floors/carpet_green.dmi'
floor_tile = /obj/item/stack/tile/carpet/green
- canSmoothWith = list(/turf/simulated/floor/carpet/green)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_GREEN)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_GREEN)
/turf/simulated/floor/carpet/orange
icon = 'icons/turf/floors/carpet_orange.dmi'
floor_tile = /obj/item/stack/tile/carpet/orange
- canSmoothWith = list(/turf/simulated/floor/carpet/orange)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_ORANGE)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_ORANGE)
/turf/simulated/floor/carpet/purple
icon = 'icons/turf/floors/carpet_purple.dmi'
floor_tile = /obj/item/stack/tile/carpet/purple
- canSmoothWith = list(/turf/simulated/floor/carpet/purple)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_PURPLE)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_PURPLE)
/turf/simulated/floor/carpet/red
icon = 'icons/turf/floors/carpet_red.dmi'
floor_tile = /obj/item/stack/tile/carpet/red
- canSmoothWith = list(/turf/simulated/floor/carpet/red)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_RED)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_RED)
/turf/simulated/floor/carpet/royalblack
icon = 'icons/turf/floors/carpet_royalblack.dmi'
floor_tile = /obj/item/stack/tile/carpet/royalblack
- canSmoothWith = list(/turf/simulated/floor/carpet/royalblack)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_ROYALBLACK)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_ROYALBLACK)
/turf/simulated/floor/carpet/royalblue
icon = 'icons/turf/floors/carpet_royalblue.dmi'
floor_tile = /obj/item/stack/tile/carpet/royalblue
- canSmoothWith = list(/turf/simulated/floor/carpet/royalblue)
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET, SMOOTH_GROUP_CARPET_ROYALBLUE)
+ canSmoothWith = list(SMOOTH_GROUP_CARPET_ROYALBLUE)
//End of carpets
@@ -162,6 +195,7 @@
icon_state = "0"
floor_tile = /obj/item/stack/tile/fakespace
broken_states = list("damaged")
+ smoothing_flags = NONE
plane = PLANE_SPACE
/turf/simulated/floor/fakespace/Initialize(mapload)
@@ -178,4 +212,4 @@
icon = 'icons/goonstation/turf/floor.dmi'
icon_state = "arcade"
floor_tile = /obj/item/stack/tile/arcade_carpet
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm
index 67e3f3f5ecd..58ab2b29708 100644
--- a/code/game/turfs/simulated/floor/indestructible.dm
+++ b/code/game/turfs/simulated/floor/indestructible.dm
@@ -81,7 +81,7 @@
nitrogen = 23
temperature = 300
planetary_atmos = TRUE
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_CORNERS
/turf/simulated/floor/indestructible/hierophant/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm
index 94b72006040..66d8fb8dc0a 100644
--- a/code/game/turfs/simulated/floor/lava.dm
+++ b/code/game/turfs/simulated/floor/lava.dm
@@ -127,9 +127,11 @@
name = "lava"
baseturf = /turf/simulated/floor/plating/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
- icon_state = "unsmooth"
- smooth = SMOOTH_MORE | SMOOTH_BORDER
- canSmoothWith = list(/turf/simulated/floor/plating/lava/smooth)
+ icon_state = "lava-255"
+ base_icon_state = "lava"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
+ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_FLOOR_LAVA)
+ canSmoothWith = list(SMOOTH_GROUP_FLOOR_LAVA)
/turf/simulated/floor/plating/lava/smooth/lava_land_surface
temperature = 300
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 96b79588793..b4c957cbba2 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -1,12 +1,12 @@
/turf/simulated/floor/vault
icon = 'icons/turf/floors.dmi'
icon_state = "rockvault"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/simulated/wall/vault
icon = 'icons/turf/walls.dmi'
icon_state = "rockvault"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/simulated/floor/bluegrid
icon = 'icons/turf/floors.dmi'
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index ad26fa8919e..e8574e06d62 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -11,6 +11,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+ smoothing_groups = list(SMOOTH_GROUP_TURF)
/turf/simulated/floor/plating/Initialize(mapload)
. = ..()
@@ -374,15 +375,15 @@
/turf/simulated/floor/plating/ice
name = "ice sheet"
desc = "A sheet of solid ice. Looks slippery."
- icon = 'icons/turf/floors/ice_turfs.dmi'
+ icon = 'icons/turf/floors/ice_turf.dmi'
icon_state = "unsmooth"
oxygen = 22
nitrogen = 82
temperature = 180
baseturf = /turf/simulated/floor/plating/ice
slowdown = TRUE
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice)
+ smoothing_flags = SMOOTH_CORNERS
+ canSmoothWith = list(SMOOTH_GROUP_FLOOR_ICE)
/turf/simulated/floor/plating/ice/Initialize(mapload)
. = ..()
@@ -393,8 +394,8 @@
/turf/simulated/floor/plating/ice/smooth
icon_state = "smooth"
- smooth = SMOOTH_MORE | SMOOTH_BORDER
- canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice)
+ smoothing_flags = SMOOTH_CORNERS | SMOOTH_BORDER
+ canSmoothWith = list(SMOOTH_GROUP_FLOOR_ICE)
/turf/simulated/floor/plating/nitrogen
oxygen = 0
diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm
index 81030c4d294..cbda1a32ed9 100644
--- a/code/game/turfs/simulated/floor/transparent.dm
+++ b/code/game/turfs/simulated/floor/transparent.dm
@@ -2,10 +2,12 @@
name = "glass floor"
desc = "Don't jump on it... Or do, I'm not your mom."
icon = 'icons/turf/floors/glass.dmi'
- icon_state = "unsmooth"
+ icon_state = "glass-0"
+ base_icon_state = "glass"
baseturf = /turf/space
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/turf/simulated/floor/transparent/glass, /turf/simulated/floor/transparent/glass/reinforced, /turf/simulated/floor/transparent/glass/plasma, /turf/simulated/floor/transparent/glass/reinforced/plasma)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_GLASS_FLOOR)
+ canSmoothWith = list(SMOOTH_GROUP_GLASS_FLOOR)
footstep = FOOTSTEP_GLASS
barefootstep = FOOTSTEP_GLASS_BAREFOOT
clawfootstep = FOOTSTEP_GLASS_BAREFOOT
@@ -78,6 +80,8 @@
name = "reinforced glass floor"
desc = "Jump on it, it can cope. Promise..."
icon = 'icons/turf/floors/reinf_glass.dmi'
+ icon_state = "reinf_glass-0"
+ base_icon_state = "reinf_glass"
thermal_conductivity = 0.035
heat_capacity = 1600
@@ -89,6 +93,8 @@
name = "plasma glass floor"
desc = "Wait, was space always that color?"
icon = 'icons/turf/floors/plasmaglass.dmi'
+ icon_state = "plasmaglass-0"
+ base_icon_state = "plasmaglass"
thermal_conductivity = 0.030
heat_capacity = 32000
@@ -96,6 +102,8 @@
name = "reinforced plasma glass floor"
desc = "For when you REALLY don't want your floor choice to suffocate everyone."
icon = 'icons/turf/floors/reinf_plasmaglass.dmi'
+ icon_state = "reinf_plasmaglass-0"
+ base_icon_state = "reinf_plasmaglass"
thermal_conductivity = 0.025
heat_capacity = 325000
@@ -103,10 +111,15 @@
name = "titanium glass floor"
desc = "Stylish AND strong!"
icon = 'icons/turf/floors/titaniumglass.dmi'
- canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plasma)
+ icon_state = "titaniumglass-0"
+ base_icon_state = "titaniumglass"
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_GLASS_FLOOR_TITANIUM)
+ canSmoothWith = list(SMOOTH_GROUP_GLASS_FLOOR_TITANIUM)
thermal_conductivity = 0.025
heat_capacity = 1600
/turf/simulated/floor/transparent/glass/titanium/plasma
name = "plastitanium glass floor"
icon = 'icons/turf/floors/plastitaniumglass.dmi'
+ icon_state = "plastitaniumglass-0"
+ base_icon_state = "plastitaniumglass"
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 2cbce40cde2..812ad0976dc 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -2,11 +2,13 @@
/turf/simulated/mineral //wall piece
name = "rock"
- icon = 'icons/turf/mining.dmi'
- icon_state = "rock"
- var/smooth_icon = 'icons/turf/smoothrocks.dmi'
- smooth = SMOOTH_MORE | SMOOTH_BORDER
- canSmoothWith = null
+ icon = 'icons/turf/smoothrocks.dmi'
+ icon_state = "smoothrocks-0"
+ base_icon_state = "smoothrocks"
+ transform = matrix(1, 0, -4, 0, 1, -4)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
baseturf = /turf/simulated/floor/plating/asteroid/airless
opacity = 1
density = TRUE
@@ -26,12 +28,6 @@
var/defer_change = 0
/turf/simulated/mineral/Initialize(mapload)
- if(!canSmoothWith)
- canSmoothWith = list(/turf/simulated/mineral)
- var/matrix/M = new
- M.Translate(-4, -4)
- transform = M
- icon = smooth_icon
. = ..()
if(mineralType && mineralAmt && spread && spreadChance)
for(var/dir in GLOB.cardinal)
@@ -45,14 +41,7 @@
/turf/simulated/mineral/shuttleRotate(rotation)
setDir(angle2dir(rotation + dir2angle(dir)))
- queue_smooth(src)
-
-/turf/simulated/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
- if(turf_type)
- underlay_appearance.icon = initial(turf_type.icon)
- underlay_appearance.icon_state = initial(turf_type.icon_state)
- return TRUE
- return ..()
+ QUEUE_SMOOTH(src)
/turf/simulated/mineral/attackby(obj/item/I, mob/user, params)
if(!user.IsAdvancedToolUser())
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index f0cb71fe2ee..1abd2147003 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -6,7 +6,12 @@
name = "wall"
desc = "A huge chunk of metal used to separate rooms."
icon = 'icons/turf/walls/wall.dmi'
- icon_state = "wall"
+ icon_state = "wall-0"
+ base_icon_state = "wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS)
+
var/rotting = FALSE
var/damage = 0
@@ -36,14 +41,19 @@
var/sheet_amount = 2
var/girder_type = /obj/structure/girder
- canSmoothWith = list(
- /turf/simulated/wall,
- /turf/simulated/wall/r_wall,
- /obj/structure/falsewall,
- /obj/structure/falsewall/reinforced,
- /turf/simulated/wall/rust,
- /turf/simulated/wall/r_wall/rust)
- smooth = SMOOTH_TRUE
+/turf/simulated/wall/Initialize(mapload)
+ . = ..()
+ if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS && fixed_underlay) //Set underlays for the diagonal walls.
+ var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = FLOOR_PLANE)
+ if(fixed_underlay["space"])
+ underlay_appearance.icon = 'icons/turf/space.dmi'
+ underlay_appearance.icon_state = SPACE_ICON_STATE
+ underlay_appearance.plane = PLANE_SPACE
+ else
+ underlay_appearance.icon = fixed_underlay["icon"]
+ underlay_appearance.icon_state = fixed_underlay["icon_state"]
+ fixed_underlay = string_assoc_list(fixed_underlay)
+ underlays += underlay_appearance
/turf/simulated/wall/BeforeChange()
for(var/obj/effect/overlay/wall_rot/WR in src)
@@ -76,7 +86,7 @@
if(!damage_overlays[1]) //list hasn't been populated
generate_overlays()
- queue_smooth(src)
+ QUEUE_SMOOTH(src)
if(!damage)
if(damage_overlay)
overlays -= damage_overlays[damage_overlay]
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 37208cd0b81..8ac7c8c973e 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -56,10 +56,12 @@
name = "necropolis wall"
desc = "A thick, seemingly indestructible stone wall."
icon = 'icons/turf/walls/boss_wall.dmi'
- icon_state = "wall"
- canSmoothWith = list(/turf/simulated/wall/indestructible/boss, /turf/simulated/wall/indestructible/boss/see_through)
+ icon_state = "boss_wall-0"
+ base_icon_state = "boss_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BOSS_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS)
baseturf = /turf/simulated/floor/plating/asteroid/basalt
- smooth = SMOOTH_TRUE
/turf/simulated/wall/indestructible/boss/see_through
opacity = FALSE
@@ -69,12 +71,13 @@
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_CORNERS
/turf/simulated/wall/indestructible/sandstone
icon = 'icons/turf/walls/sandstone_wall.dmi'
- icon_state = "sandstone"
- canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
+ icon_state = "sandstone_wall-0"
+ base_icon_state = "sandstone_wall"
+ smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/indestructible/splashscreen
name = "Space Station 13"
@@ -84,23 +87,28 @@
/turf/simulated/wall/indestructible/uranium
icon = 'icons/turf/walls/uranium_wall.dmi'
- icon_state = "uranium"
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
+ icon_state = "uranium_wall-0"
+ base_icon_state = "uranium_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
/turf/simulated/wall/indestructible/wood
icon = 'icons/turf/walls/wood_wall.dmi'
- icon_state = "wood"
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
+ icon_state = "wood_wall-0"
+ base_icon_state = "wood_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
/turf/simulated/wall/indestructible/alien
name = "alien wall"
desc = "A wall with alien alloy plating."
icon = 'icons/turf/walls/abductor_wall.dmi'
- icon_state = "abductor"
- smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
+ icon_state = "abductor-0"
+ base_icon_state = "abductor"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
/turf/simulated/wall/indestructible/abductor
icon = 'icons/turf/walls.dmi'
@@ -115,9 +123,11 @@
name = "window"
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
icon_state = "fake_window"
+ base_icon_state = "reinforced_window"
opacity = FALSE
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE)
/turf/simulated/wall/indestructible/fakeglass/Initialize(mapload)
. = ..()
@@ -128,10 +138,12 @@
/turf/simulated/wall/indestructible/opsglass
name = "window"
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
- icon_state = "plastitanium_window"
+ icon_state = "plastitanium_window-0"
+ base_icon_state = "plastitanium_window"
opacity = FALSE
- smooth = SMOOTH_TRUE
- canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
/turf/simulated/wall/indestructible/opsglass/Initialize(mapload)
. = ..()
@@ -152,11 +164,17 @@
icon_state = "snowrock"
/turf/simulated/wall/indestructible/riveted
- icon = 'icons/turf/walls.dmi'
- icon_state = "riveted"
+ icon = 'icons/turf/walls/riveted.dmi'
+ icon_state = "riveted-0"
+ base_icon_state = "riveted"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS)
/turf/simulated/wall/indestructible/syndicate
icon = 'icons/turf/walls/plastitanium_wall.dmi'
- icon_state = "map-shuttle"
- smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
+ icon_state = "plastitanium_wall-0"
+ base_icon_state = "plastitanium_wall"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 6e8891f64e0..4da47e7660f 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -4,8 +4,8 @@
icon_state = ""
var/last_event = 0
var/active = null
+ smoothing_flags = SMOOTH_BITMASK
canSmoothWith = null
- smooth = SMOOTH_TRUE
/turf/simulated/wall/mineral/shuttleRotate(rotation)
return //This override is needed to properly rotate the object when on a shuttle that is rotated.
@@ -14,52 +14,64 @@
name = "gold wall"
desc = "A wall with gold plating. Swag!"
icon = 'icons/turf/walls/gold_wall.dmi'
- icon_state = "gold"
+ icon_state = "gold_wall-0"
+ base_icon_state = "gold_wall"
sheet_type = /obj/item/stack/sheet/mineral/gold
explosion_block = 0 //gold is a soft metal you dingus.
- canSmoothWith = list(/turf/simulated/wall/mineral/gold, /obj/structure/falsewall/gold)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_GOLD_WALLS)
/turf/simulated/wall/mineral/silver
name = "silver wall"
desc = "A wall with silver plating. Shiny!"
icon = 'icons/turf/walls/silver_wall.dmi'
- icon_state = "silver"
+ icon_state = "silver_wall-0"
+ base_icon_state = "silver_wall"
sheet_type = /obj/item/stack/sheet/mineral/silver
- canSmoothWith = list(/turf/simulated/wall/mineral/silver, /obj/structure/falsewall/silver)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SILVER_WALLS)
/turf/simulated/wall/mineral/diamond
name = "diamond wall"
desc = "A wall with diamond plating. You monster."
icon = 'icons/turf/walls/diamond_wall.dmi'
- icon_state = "diamond"
+ icon_state = "diamond_wall-0"
+ base_icon_state = "diamond_wall"
sheet_type = /obj/item/stack/sheet/mineral/diamond
explosion_block = 3
- canSmoothWith = list(/turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_DIAMOND_WALLS)
/turf/simulated/wall/mineral/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
- icon_state = "bananium"
+ icon_state = "bananium_wall-0"
+ base_icon_state = "bananium_wall"
sheet_type = /obj/item/stack/sheet/mineral/bananium
- canSmoothWith = list(/turf/simulated/wall/mineral/bananium, /obj/structure/falsewall/bananium)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_BANANIUM_WALLS)
/turf/simulated/wall/mineral/sandstone
name = "sandstone wall"
desc = "A wall with sandstone plating."
icon = 'icons/turf/walls/sandstone_wall.dmi'
- icon_state = "sandstone"
+ icon_state = "sandstone_wall-0"
+ base_icon_state = "sandstone_wall"
sheet_type = /obj/item/stack/sheet/mineral/sandstone
explosion_block = 0
- canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SANDSTONE_WALLS)
/turf/simulated/wall/mineral/uranium
name = "uranium wall"
desc = "A wall with uranium plating. This is probably a bad idea."
icon = 'icons/turf/walls/uranium_wall.dmi'
- icon_state = "uranium"
+ icon_state = "uranium_wall-0"
+ base_icon_state = "uranium_wall"
sheet_type = /obj/item/stack/sheet/mineral/uranium
- canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS)
/turf/simulated/wall/mineral/uranium/proc/radiate()
if(!active)
@@ -87,10 +99,12 @@
name = "plasma wall"
desc = "A wall with plasma plating. This is definitely a bad idea."
icon = 'icons/turf/walls/plasma_wall.dmi'
- icon_state = "plasma"
+ icon_state = "plasma_wall-0"
+ base_icon_state = "plasma_wall"
sheet_type = /obj/item/stack/sheet/mineral/plasma
thermal_conductivity = 0.04
- canSmoothWith = list(/turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS)
/turf/simulated/wall/mineral/plasma/attackby(obj/item/W as obj, mob/user as mob)
if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
@@ -138,19 +152,24 @@
name = "alien wall"
desc = "A strange-looking alien wall."
icon = 'icons/turf/walls/plasma_wall.dmi'
- icon_state = "plasma"
+ icon_state = "abductor_wall-0"
+ base_icon_state = "abductor_wall"
sheet_type = /obj/item/stack/sheet/mineral/abductor
- canSmoothWith = list(/turf/simulated/wall/mineral/alien, /obj/structure/falsewall/alien)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
/turf/simulated/wall/mineral/wood
name = "wooden wall"
desc = "A wall with wooden plating. Stiff."
icon = 'icons/turf/walls/wood_wall.dmi'
- icon_state = "wood"
+ icon_state = "wood_wall-0"
+ base_icon_state = "wood_wall"
sheet_type = /obj/item/stack/sheet/wood
hardness = 70
explosion_block = 0
- canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
/turf/simulated/wall/mineral/wood/attackby(obj/item/W, mob/user)
if(W.sharp && W.force)
@@ -166,52 +185,59 @@
desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal."
girder_type = /obj/structure/barricade/wooden
hardness = 50
- canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
/turf/simulated/wall/mineral/iron
name = "rough metal wall"
desc = "A wall with rough metal plating."
icon = 'icons/turf/walls/iron_wall.dmi'
- icon_state = "iron"
+ icon_state = "iron_wall-0"
+ base_icon_state = "iron_wall"
sheet_type = /obj/item/stack/rods
sheet_amount = 5
- canSmoothWith = list(/turf/simulated/wall/mineral/iron, /obj/structure/falsewall/iron)
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_IRON_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_IRON_WALLS)
/turf/simulated/wall/mineral/abductor
name = "alien wall"
desc = "A wall with alien alloy plating."
icon = 'icons/turf/walls/abductor_wall.dmi'
- icon_state = "abductor"
- smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
+ icon_state = "abductor_wall-0"
+ base_icon_state = "abductor_wall"
sheet_type = /obj/item/stack/sheet/mineral/abductor
explosion_block = 3
- canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
/////////////////////Titanium walls/////////////////////
/turf/simulated/wall/mineral/titanium //has to use this path due to how building walls works
name = "wall"
desc = "A light-weight titanium wall used in shuttles."
- icon = 'icons/turf/walls/shuttle_wall.dmi'
- icon_state = "map-shuttle"
+ icon = 'icons/turf/walls/plastinum_wall.dmi'
+ icon_state = "plastinum_wall-0"
+ base_icon_state = "plastinum_wall"
explosion_block = 3
flags_2 = CHECK_RICOCHET_2
sheet_type = /obj/item/stack/sheet/mineral/titanium
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
+ canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
/turf/simulated/wall/mineral/titanium/nodiagonal
- smooth = SMOOTH_MORE
icon_state = "map-shuttle_nd"
+ base_icon_state = "plastinum_wall"
+ smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/titanium/nosmooth
- icon = 'icons/turf/shuttle.dmi'
- icon_state = "wall"
- smooth = SMOOTH_FALSE
+ icon_state = "plastinum_wall"
+ smoothing_flags = NONE
/turf/simulated/wall/mineral/titanium/overspace
icon_state = "map-overspace"
- fixed_underlay = list("space"=1)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ fixed_underlay = list("space" = TRUE)
//sub-type to be used for interior shuttle walls
//won't get an underlay of the destination turf on shuttle move
@@ -240,15 +266,19 @@
name = "pod wall"
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
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/full, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine)
+ icon_state = "survival_pod_walls-0"
+ base_icon_state = "survival_pod_walls"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
/turf/simulated/wall/mineral/titanium/survival/nodiagonal
- smooth = SMOOTH_MORE
+ icon = 'icons/turf/walls/survival_pod_walls.dmi'
+ icon_state = "survival_pod_walls-0"
+ base_icon_state = "survival_pod_walls"
+ smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/titanium/survival/pod
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod)
//undeconstructable type for derelict
//these walls are undeconstructable/unthermitable
@@ -260,11 +290,11 @@
fixed_underlay = list("icon"='icons/turf/floors.dmi', "icon_state"="darkredfull")
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal
- smooth = SMOOTH_MORE
+ smoothing_flags = SMOOTH_CORNERS
icon_state = "map-shuttle_nd"
/turf/simulated/wall/mineral/titanium/nodecon/nosmooth
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
@@ -287,24 +317,28 @@
name = "wall"
desc = "An evil wall of plasma and titanium."
icon = 'icons/turf/walls/plastitanium_wall.dmi'
- icon_state = "map-shuttle"
+ icon_state = "plastitanium_wall-0"
+ base_icon_state = "plastitanium_wall"
explosion_block = 4
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
- smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
/turf/simulated/wall/mineral/plastitanium/nodiagonal
- smooth = SMOOTH_MORE
icon_state = "map-shuttle_nd"
+ base_icon_state = "plastitanium_wall"
+ smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/plastitanium/nosmooth
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
/turf/simulated/wall/mineral/plastitanium/overspace
icon_state = "map-overspace"
- fixed_underlay = list("space"=1)
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ fixed_underlay = list("space" = TRUE)
//have to copypaste this code
/turf/simulated/wall/mineral/plastitanium/interior/copyTurf(turf/T)
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index b5026e64673..f5f33ec7728 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -2,9 +2,10 @@
name = "runed metal wall"
desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound."
icon = 'icons/turf/walls/cult_wall.dmi'
- icon_state = "cult"
+ icon_state = "cult_wall-0"
+ base_icon_state = "cult_wall"
+ smoothing_flags = SMOOTH_BITMASK
canSmoothWith = null
- smooth = SMOOTH_FALSE
sheet_type = /obj/item/stack/sheet/runed_metal
sheet_amount = 1
girder_type = /obj/structure/girder/cult
@@ -36,13 +37,17 @@
name = "rusted wall"
desc = "A rusted metal wall."
icon = 'icons/turf/walls/rusty_wall.dmi'
- icon_state = "arust"
+ icon_state = "rusty_wall-0"
+ base_icon_state = "rusty_wall"
+ smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/r_wall/rust
name = "rusted reinforced wall"
desc = "A huge chunk of rusted reinforced metal."
icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
- icon_state = "rrust"
+ icon_state = "rusty_reinforced_wall-0"
+ base_icon_state = "rusty_reinforced_wall"
+ smoothing_flags = SMOOTH_BITMASK
//Clockwork walls
/turf/simulated/wall/clockwork
@@ -56,6 +61,8 @@
girder_type = /obj/structure/clockwork/wall_gear
var/heated
var/obj/effect/clockwork/overlay/wall/realappearance
+ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL)
+ canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL)
/turf/simulated/wall/clockwork/Initialize()
. = ..()
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index d840ff2c355..b572105ccce 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -2,7 +2,9 @@
name = "reinforced wall"
desc = "A huge chunk of reinforced metal used to separate rooms."
icon = 'icons/turf/walls/reinforced_wall.dmi'
- icon_state = "r_wall"
+ icon_state = "reinforced_wall-0"
+ base_icon_state = "reinforced_wall"
+ smoothing_flags = SMOOTH_BITMASK
opacity = 1
density = 1
explosion_block = 2
@@ -69,7 +71,7 @@
return
d_state = RWALL_INTACT
update_icon()
- queue_smooth_neighbors(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
to_chat(user, "You repair the last of the damage.")
return
else
@@ -213,11 +215,12 @@
if(d_state)
icon_state = "r_wall-[d_state]"
- smooth = SMOOTH_FALSE
- clear_smooth_overlays()
+ smoothing_flags = NONE
else
- smooth = SMOOTH_TRUE
- icon_state = ""
+ smoothing_flags = SMOOTH_BITMASK
+ icon_state = "[base_icon_state]-[smoothing_junction]"
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ QUEUE_SMOOTH(src)
/turf/simulated/wall/r_wall/devastate_wall()
new sheet_type(src, sheet_amount)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index a107250f18d..b943673c14b 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -28,6 +28,16 @@
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
+ if(length(smoothing_groups))
+ sortTim(smoothing_groups) //In case it's not properly ordered, let's avoid duplicate entries with the same values.
+ SET_BITFLAG_LIST(smoothing_groups)
+
+ if(length(canSmoothWith))
+ sortTim(canSmoothWith)
+ if(canSmoothWith[length(canSmoothWith)] > MAX_S_TURF) //If the last element is higher than the maximum turf-only value, then it must scan turf contents for smoothing targets.
+ smoothing_flags |= SMOOTH_OBJ
+ SET_BITFLAG_LIST(canSmoothWith)
+
var/area/A = loc
if(!IS_DYNAMIC_LIGHTING(src) && IS_DYNAMIC_LIGHTING(A))
add_overlay(/obj/effect/fullbright)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index fd8d2ecf040..0df41ba0928 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -8,6 +8,9 @@
var/slowdown = 0 //negative for faster, positive for slower
var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not
+ ///Icon-smoothing variable to map a diagonal wall corner with a fixed underlay.
+ var/list/fixed_underlay = null
+
///Properties for open tiles (/floor)
/// All the gas vars, on the turf, are meant to be utilized for initializing a gas datum and setting its first gas values; the turf vars are never further modified at runtime; it is never directly used for calculations by the atmospherics system.
var/oxygen = 0
@@ -46,8 +49,16 @@
vis_contents.Cut()
levelupdate()
- if(smooth)
- queue_smooth(src)
+ if(length(smoothing_groups))
+ sortTim(smoothing_groups) //In case it's not properly ordered, let's avoid duplicate entries with the same values.
+ SET_BITFLAG_LIST(smoothing_groups)
+ if(length(canSmoothWith))
+ sortTim(canSmoothWith)
+ if(canSmoothWith[length(canSmoothWith)] > MAX_S_TURF) //If the last element is higher than the maximum turf-only value, then it must scan turf contents for smoothing targets.
+ smoothing_flags |= SMOOTH_OBJ
+ SET_BITFLAG_LIST(canSmoothWith)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH(src)
visibilityChanged()
for(var/atom/movable/AM in src)
diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm
index 418e256fd8d..39e9f6d0040 100644
--- a/code/modules/awaymissions/mission_code/beach.dm
+++ b/code/modules/awaymissions/mission_code/beach.dm
@@ -86,6 +86,7 @@
barefootstep = FOOTSTEP_WATER
clawfootstep = FOOTSTEP_WATER
heavyfootstep = FOOTSTEP_WATER
+ smoothing_groups = list(SMOOTH_GROUP_BEACH_WATER)
/turf/simulated/floor/beach/away/water/Entered(atom/movable/AM, atom/OldLoc)
. = ..()
@@ -120,13 +121,11 @@
/turf/simulated/floor/beach/away/water/drop
name = "Water"
icon = 'icons/turf/floors/seadrop.dmi'
- icon_state = "seadrop"
+ icon_state = "seadrop-0"
+ base_icon_state = "seadrop"
water_overlay_image = null
- smooth = SMOOTH_TRUE
- canSmoothWith = list(
- /turf/simulated/floor/beach/away/water/drop, /turf/simulated/floor/beach/away/water/drop/dense,
- /turf/simulated/floor/beach/away/water, /turf/simulated/floor/beach/away/water/dense,
- /turf/simulated/floor/beach/away/water/edge_drop)
+ smoothing_flags = SMOOTH_BITMASK
+ canSmoothWith = list(SMOOTH_GROUP_BEACH_WATER)
var/obj/effect/beach_drop_overlay/water_overlay
baseturf = /turf/simulated/floor/beach/away/water/drop
@@ -141,13 +140,11 @@
/obj/effect/beach_drop_overlay
name = "Water"
icon = 'icons/turf/floors/seadrop-o.dmi'
+ base_icon_state = "seadrop-o"
layer = MOB_LAYER + 0.1
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_BITMASK
+ canSmoothWith = list(SMOOTH_GROUP_BEACH_WATER)
anchored = 1
- canSmoothWith = list(
- /turf/simulated/floor/beach/away/water/drop, /turf/simulated/floor/beach/away/water/drop/dense,
- /turf/simulated/floor/beach/away/water, /turf/simulated/floor/beach/away/water/dense,
- /turf/simulated/floor/beach/away/water/edge_drop)
/turf/simulated/floor/beach/away/water/drop/dense
density = TRUE
@@ -155,6 +152,7 @@
/turf/simulated/floor/beach/away/water/deep
name = "Deep Water"
+ smoothing_groups = list()
icon_state = "seadeep"
water_overlay_image = "water_deep"
baseturf = /turf/simulated/floor/beach/away/water/deep
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 0c18062d189..80326a6c141 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -14,12 +14,12 @@
subtimer = start_watch()
log_debug("Smoothing tiles")
for(var/turf/T in smoothTurfs)
- if(T.smooth)
- queue_smooth(T)
+ if(T.smoothing_flags)
+ QUEUE_SMOOTH(T)
for(var/R in T)
var/atom/A = R
- if(A.smooth)
- queue_smooth(A)
+ if(A.smoothing_flags)
+ QUEUE_SMOOTH(A)
log_debug("\tTook [stop_watch(subtimer)]s")
log_debug("Late setup finished - took [stop_watch(total_timer)]s")
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index ca0a4df5f69..9baa785a556 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -73,10 +73,12 @@
/obj/structure/window/full/shuttle/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/pod_window.dmi'
- icon_state = "smooth"
- smooth = SMOOTH_MORE
+ icon_state = "pod_window-0"
+ base_icon_state = "pod_window"
+ smoothing_flags = SMOOTH_BITMASK
glass_type = /obj/item/stack/sheet/titaniumglass
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/full/shuttle/survival_pod)
+ smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
+ canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
/obj/structure/window/reinforced/survival_pod
name = "pod window"
@@ -128,7 +130,9 @@
/obj/structure/table/survival_pod
icon = 'icons/obj/lavaland/survival_pod.dmi'
icon_state = "table"
- smooth = SMOOTH_FALSE
+ smoothing_flags = NONE
+ smoothing_groups = null
+ canSmoothWith = null
//Sleeper
/obj/machinery/sleeper/survival_pod
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 92318dbe450..7618bea4f07 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -100,7 +100,7 @@ Difficulty: Hard
/datum/action/innate/megafauna_attack/hallucination_surround
name = "Surround Target"
icon_icon = 'icons/turf/walls/wall.dmi'
- button_icon_state = "wall"
+ button_icon_state = "wall-0"
chosen_message = "You are now surrounding the target you click on with hallucinations."
chosen_attack_num = 3
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 a85bff9c834..8aec856c8c5 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -512,18 +512,23 @@ Difficulty: Hard
/obj/effect/temp_visual/hierophant/wall //smoothing and pooling were not friends, but pooling is dead.
name = "vortex wall"
icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
- icon_state = "wall"
+ icon_state = "hierophant_wall_temp-0"
+ base_icon_state = "hierophant_wall_temp"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_HIERO_WALL)
+ canSmoothWith = list(SMOOTH_GROUP_HIERO_WALL)
light_range = MINIMUM_USEFUL_LIGHT_RANGE
duration = 100
- smooth = SMOOTH_TRUE
/obj/effect/temp_visual/hierophant/wall/Initialize(mapload, new_caster)
. = ..()
- queue_smooth_neighbors(src)
- queue_smooth(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ QUEUE_SMOOTH(src)
/obj/effect/temp_visual/hierophant/wall/Destroy()
- queue_smooth_neighbors(src)
+ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index 45f8222d335..0812991bfb9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -293,4 +293,5 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
name = "swarmer catwalk"
desc = "A catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
icon = 'icons/obj/smooth_structures/swarmer_catwalk.dmi'
- icon_state = "swarmer_catwalk"
+ icon_state = "swarmer_catwalk-0"
+ base_icon_state = "swarmer_catwalk"
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 4c5a16a05ed..dabf5417f1f 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
@@ -6,10 +6,10 @@
icon = 'icons/effects/spacevines.dmi'
icon_state = "flower_bud"
layer = MOB_LAYER + 0.9
- opacity = 0
- canSmoothWith = list()
- smooth = SMOOTH_FALSE
- var/growth_time = 1200
+ opacity = FALSE
+ canSmoothWith = null
+ smoothing_flags = NONE
+ var/growth_time = 120 SECONDS
/obj/structure/alien/resin/flower_bud_enemy/New()
..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 280e8da9f03..ff3650f7009 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -88,7 +88,7 @@
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
light_range = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
- var/base_icon_state = "darkmatter"
+ base_icon_state = "darkmatter"
///The id of our supermatter
var/supermatter_id = 1
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 41ffa226227..2fb16126c56 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -684,7 +684,7 @@
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
plane = FLOOR_PLANE
layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes
- var/base_icon_state // initial icon state on map
+ base_icon_state // initial icon state on map
// new pipe, set the icon_state as on map
/obj/structure/disposalpipe/Initialize(mapload)
diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
index 0d56293f1bc..743a799855a 100644
--- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
+++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
@@ -47,17 +47,17 @@
name = "clockwork wall"
icon = 'icons/turf/walls/clockwork_wall.dmi'
icon_state = "clockwork_wall"
- canSmoothWith = list(/obj/effect/clockwork/overlay/wall, /obj/structure/falsewall/brass)
- smooth = SMOOTH_TRUE
+ canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL)
+ smoothing_flags = SMOOTH_CORNERS
layer = CLOSED_TURF_LAYER
/obj/effect/clockwork/overlay/wall/Initialize(mapload)
. = ..()
- queue_smooth_neighbors(src)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/queue_smooth, src), 1)
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ QUEUE_SMOOTH(src)
/obj/effect/clockwork/overlay/wall/Destroy()
- queue_smooth_neighbors(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
/obj/effect/clockwork/overlay/floor
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 1d9f6970135..0b1215235ea 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -57,8 +57,8 @@
// After docking //
/atom/proc/postDock(obj/docking_port/S1)
- if(smooth)
- queue_smooth(src)
+ if(smoothing_flags)
+ QUEUE_SMOOTH(src)
/mob/postDock()
update_parallax_contents()
diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm
index 3d3b52d9023..30bf49594ad 100644
--- a/code/modules/shuttle/ripple.dm
+++ b/code/modules/shuttle/ripple.dm
@@ -4,10 +4,12 @@
visual disturbances. It's probably best not to be on top of these \
when whatever is tunneling comes through."
icon = 'icons/turf/floors/ripple.dmi'
- icon_state = "ripple"
+ icon_state = "ripple-0"
+ base_icon_state = "ripple"
anchored = TRUE
density = FALSE
- smooth = SMOOTH_TRUE
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_RIPPLE)
layer = RIPPLE_LAYER
alpha = 0
duration = 3 * SHUTTLE_RIPPLE_TIME
@@ -15,5 +17,5 @@
/obj/effect/temp_visual/ripple/New()
. = ..()
- queue_smooth(src)
+ QUEUE_SMOOTH(src)
animate(src, alpha=255, time=SHUTTLE_RIPPLE_TIME)
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 9d1989e70fb..8822dbc51ce 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -11,8 +11,8 @@ 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))
- queue_smooth(src)
+ if(params & ROTATE_SMOOTH && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ QUEUE_SMOOTH(src)
//rotate the pixel offsets too.
if((pixel_x || pixel_y) && (params & ROTATE_OFFSET))
diff --git a/icons/effects/dirt.dmi b/icons/effects/dirt.dmi
index 5c8bc8f61a0c4e40e936dcfaf89e1c95036b8f57..69c698f1f3fd6a25d9b6546f2339895402e814fa 100644
GIT binary patch
literal 9826
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