Skip to content

Commit e5a542b

Browse files
Adding UID to flooring decls.
1 parent db5cfdf commit e5a542b

File tree

22 files changed

+120
-9
lines changed

22 files changed

+120
-9
lines changed

code/game/turfs/flooring/_flooring.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var/global/list/flooring_cache = list()
99

1010
/decl/flooring
1111
abstract_type = /decl/flooring
12+
decl_flags = DECL_FLAG_MANDATORY_UID
1213

1314
var/name
1415
var/desc

code/game/turfs/flooring/flooring_carpet.dm

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
footstep_type = /decl/footsteps/carpet
1212
force_material = /decl/material/solid/organic/cloth
1313
constructed = TRUE
14+
uid = "floor_carpet"
1415
burned_states = list(
1516
"burned0",
1617
"burned1"
@@ -27,49 +28,58 @@
2728
name = "blue carpet"
2829
icon_base = "blue1"
2930
build_type = /obj/item/stack/tile/carpet/blue
31+
uid = "floor_carpet_blue"
3032

3133
/decl/flooring/carpet/blue2
3234
name = "pale blue carpet"
3335
icon_base = "blue2"
3436
build_type = /obj/item/stack/tile/carpet/blue2
37+
uid = "floor_carpet_blue2"
3538

3639
/decl/flooring/carpet/blue3
3740
name = "sea blue carpet"
3841
icon_base = "blue3"
3942
build_type = /obj/item/stack/tile/carpet/blue3
43+
uid = "floor_carpet_blue3"
4044

4145
/decl/flooring/carpet/magenta
4246
name = "magenta carpet"
4347
icon_base = "purple"
4448
build_type = /obj/item/stack/tile/carpet/magenta
49+
uid = "floor_carpet_magenta"
4550

4651
/decl/flooring/carpet/purple
4752
name = "purple carpet"
4853
icon_base = "purple"
4954
build_type = /obj/item/stack/tile/carpet/purple
55+
uid = "floor_carpet_purple"
5056

5157
/decl/flooring/carpet/orange
5258
name = "orange carpet"
5359
icon_base = "orange"
5460
build_type = /obj/item/stack/tile/carpet/orange
61+
uid = "floor_carpet_orange"
5562

5663
/decl/flooring/carpet/green
5764
name = "green carpet"
5865
icon_base = "green"
5966
build_type = /obj/item/stack/tile/carpet/green
67+
uid = "floor_carpet_green"
6068

6169
/decl/flooring/carpet/red
6270
name = "red carpet"
6371
icon_base = "red"
6472
build_type = /obj/item/stack/tile/carpet/red
73+
uid = "floor_carpet_red"
6574

6675
/decl/flooring/carpet/rustic
67-
name = "rustic carpet"
68-
desc = "A stretch of simple woven carpet. Cozy, but a little itchy."
69-
icon = 'icons/turf/flooring/simple_carpet.dmi'
70-
icon_base = "carpet"
71-
build_type = /obj/item/stack/tile/carpet/rustic
72-
can_paint = TRUE
73-
color = null
74-
broken_states = null
75-
burned_states = null
76+
name = "rustic carpet"
77+
desc = "A stretch of simple woven carpet. Cozy, but a little itchy."
78+
icon = 'icons/turf/flooring/simple_carpet.dmi'
79+
icon_base = "carpet"
80+
build_type = /obj/item/stack/tile/carpet/rustic
81+
can_paint = TRUE
82+
color = null
83+
broken_states = null
84+
burned_states = null
85+
uid = "floor_carpet_rustic"

code/game/turfs/flooring/flooring_concrete.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
has_base_range = null
77
force_material = /decl/material/solid/stone/concrete
88
constructed = TRUE
9+
uid = "floor_concrete"
910

1011
/decl/flooring/concrete/reinforced
1112
name = "reinforced concrete"
1213
icon_base = "hexacrete"
1314
desc = "A flat stretch of stone-like artificial material. It has been reinforced with an unknown compound."
15+
uid = "floor_concrete_reinf"
1416

1517
/decl/flooring/concrete/asphalt
1618
name = "asphalt"
1719
color = COLOR_GRAY40
1820
icon_base = "concrete"
1921
desc = "A stretch of rough blacktop, probably part of a road."
22+
uid = "floor_asphalt"

code/game/turfs/flooring/flooring_grass.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
flooring_flags = TURF_REMOVE_SHOVEL
1414
force_material = /decl/material/solid/organic/plantmatter/grass
1515
growth_value = 1.2 // Shouldn't really matter since you can't plant on grass, it turns to dirt first.
16+
uid = "floor_grass"
1617
var/harvestable = FALSE
1718

1819
/decl/flooring/grass/fire_act(turf/floor/target, datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -33,6 +34,7 @@
3334
has_base_range = null
3435
icon_edge_layer = FLOOR_EDGE_GRASS_WILD
3536
harvestable = TRUE
37+
uid = "floor_grass_wild"
3638

3739
/decl/flooring/grass/wild/get_movable_alpha_mask_state(atom/movable/mover)
3840
. = ..() || "mask_grass"
@@ -53,3 +55,4 @@
5355
color = "#5e7a3b"
5456
build_type = /obj/item/stack/tile/grass
5557
force_material = /decl/material/solid/organic/plastic
58+
uid = "floor_grass_fake"

code/game/turfs/flooring/flooring_holowater.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
footstep_type = /decl/footsteps/water
99
holographic = TRUE
1010
constructed = TRUE
11+
uid = "floor_water_fake"

code/game/turfs/flooring/flooring_lava.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
turf_light_color = LIGHT_COLOR_LAVA
1111
turf_light_range = 2
1212
turf_light_power = 0.7
13+
uid = "floor_lava"
1314

1415
/decl/flooring/lava/handle_environment_proc(turf/floor/target)
1516
. = PROCESS_KILL

code/game/turfs/flooring/flooring_misc.dm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
footstep_type = /decl/footsteps/tiles
1010
force_material = /decl/material/solid/organic/plastic
1111
constructed = TRUE
12+
uid = "floor_lino"
1213

1314
/decl/flooring/crystal
1415
name = "crystal flooring"
@@ -20,6 +21,7 @@
2021
color = "#00ffe1"
2122
force_material = /decl/material/solid/gemstone/crystal
2223
constructed = TRUE
24+
uid = "floor_crystal"
2325

2426
/decl/flooring/glass
2527
name = "glass flooring"
@@ -37,13 +39,15 @@
3739
z_flags = ZM_MIMIC_DEFAULTS
3840
force_material = /decl/material/solid/glass
3941
constructed = TRUE
42+
uid = "floor_glass"
4043

4144
/decl/flooring/glass/boro
4245
name = "borosilicate glass flooring"
4346
build_material = /decl/material/solid/glass/borosilicate
4447
color = GLASS_COLOR_SILICATE
4548
damage_temperature = T0C + 4000
4649
force_material = /decl/material/solid/glass/borosilicate
50+
uid = "floor_glass_boro"
4751

4852
/decl/flooring/pool
4953
name = "pool floor"
@@ -57,6 +61,7 @@
5761
force_material = /decl/material/solid/stone/ceramic
5862
constructed = TRUE
5963
gender = NEUTER
64+
uid = "floor_pool"
6065

6166
/decl/flooring/woven
6267
name = "woven floor"
@@ -71,6 +76,7 @@
7176
force_material = /decl/material/solid/organic/plantmatter/grass/dry
7277
constructed = TRUE
7378
gender = NEUTER
79+
uid = "floor_woven"
7480

7581
/decl/flooring/straw
7682
name = "straw floor"
@@ -86,3 +92,4 @@
8692
force_material = /decl/material/solid/organic/plantmatter/grass/dry
8793
constructed = TRUE
8894
gender = NEUTER
95+
uid = "floor_straw"

code/game/turfs/flooring/flooring_mud.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
growth_value = 1.1
1212
can_collect = TRUE
1313
print_type = /obj/effect/footprints
14+
uid = "floor_mud"
1415

1516
/decl/flooring/mud/fire_act(turf/floor/target, datum/gas_mixture/air, exposed_temperature, exposed_volume)
1617
if(!target.reagents?.total_volume)
@@ -43,6 +44,7 @@
4344
color = "#ae9e66"
4445
dirt_color = "#ae9e66"
4546
force_material = /decl/material/solid/soil
47+
uid = "floor_dry_mud"
4648

4749
/decl/flooring/dry_mud/fluid_act(turf/floor/target, datum/reagents/fluids)
4850
if(target.get_topmost_flooring() == src)
@@ -64,6 +66,7 @@
6466
turf_flags = TURF_FLAG_BACKGROUND | TURF_IS_HOLOMAP_PATH | TURF_FLAG_ABSORB_LIQUID
6567
force_material = /decl/material/solid/soil
6668
growth_value = 1
69+
uid = "floor_dirt"
6770

6871
/decl/flooring/dirt/fluid_act(turf/floor/target, datum/reagents/fluids)
6972
if(target.get_topmost_flooring() == src)

code/game/turfs/flooring/flooring_natural.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
force_material = /decl/material/solid/sand
99
gender = NEUTER
1010
footstep_type = /decl/footsteps/sand
11+
uid = "floor_seafloor"
1112

1213
/decl/flooring/shrouded
1314
name = "packed sand"
@@ -19,6 +20,7 @@
1920
turf_flags = TURF_FLAG_BACKGROUND | TURF_IS_HOLOMAP_PATH | TURF_FLAG_ABSORB_LIQUID
2021
force_material = /decl/material/solid/sand
2122
footstep_type = /decl/footsteps/asteroid
23+
uid = "floor_shrouded"
2224

2325
/decl/flooring/meat
2426
name = "fleshy ground"
@@ -30,6 +32,7 @@
3032
footstep_type = /decl/footsteps/mud
3133
force_material = /decl/material/solid/organic/meat
3234
print_type = /obj/effect/footprints
35+
uid = "floor_meat"
3336

3437
/decl/flooring/barren
3538
name = "ground"
@@ -42,6 +45,7 @@
4245
icon_edge_layer = FLOOR_EDGE_BARREN
4346
force_material = /decl/material/solid/soil
4447
growth_value = 0.1
48+
uid = "floor_barren"
4549

4650
/decl/flooring/clay
4751
name = "clay"
@@ -55,6 +59,7 @@
5559
growth_value = 1.2
5660
can_collect = TRUE
5761
print_type = /obj/effect/footprints
62+
uid = "floor_clay"
5863

5964
/decl/flooring/ice
6065
name = "ice"
@@ -63,6 +68,7 @@
6368
icon_base = "ice"
6469
color = COLOR_LIQUID_WATER
6570
force_material = /decl/material/solid/ice
71+
uid = "floor_ice"
6672

6773
/decl/flooring/ice/update_turf_icon(turf/floor/target)
6874
. = ..()

code/game/turfs/flooring/flooring_path.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
neighbour_type = /decl/flooring/path
88
color = null
99
constructed = TRUE
10+
uid = "floor_path"
1011

1112
// If null, this is just skipped.
1213
var/paving_adjective = "cobbled"
@@ -28,17 +29,20 @@
2829
icon_edge_layer = FLOOR_EDGE_PATH
2930
flooring_flags = TURF_REMOVE_CROWBAR
3031
has_base_range = 1
32+
uid = "floor_path_cobble"
3133

3234
/decl/flooring/path/running_bond
3335
name = "stone path"
3436
desc = "A rustic stone path, laid out in a running bond pattern."
3537
icon_base = "runningbond"
3638
has_base_range = 3
3739
gender = NEUTER
40+
uid = "floor_path_bond"
3841

3942
/decl/flooring/path/herringbone
4043
name = "stone path"
4144
desc = "A rustic stone path, laid out in a herringbone pattern."
4245
icon_base = "herringbone"
4346
has_base_range = null
4447
gender = NEUTER
48+
uid = "floor_path_herring"

0 commit comments

Comments
 (0)