From dbc3bf1c8bc0981e84aa213b3ccc0518e5c92e46 Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sat, 27 Apr 2024 03:23:48 -0500 Subject: [PATCH] Removes a lot of lists (#25272) * Removes a lot of lists * Update code/game/turfs/simulated/floor.dm Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/misc_floor.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/mineral_floors.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/mineral_floors.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> --------- Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../machinery/computer/HolodeckControl.dm | 4 ++- code/game/turfs/simulated/floor.dm | 18 +++++++---- .../turfs/simulated/floor/asteroid_floors.dm | 4 ++- .../game/turfs/simulated/floor/fancy_floor.dm | 32 ++++++++++++++----- .../game/turfs/simulated/floor/light_floor.dm | 4 ++- .../turfs/simulated/floor/mineral_floors.dm | 13 +++++--- code/game/turfs/simulated/floor/misc_floor.dm | 8 +++-- .../turfs/simulated/floor/plasteel_floor.dm | 5 +-- code/game/turfs/simulated/floor/plating.dm | 5 +-- .../game/turfs/simulated/floor/transparent.dm | 2 +- code/modules/events/spacevine.dm | 3 +- 11 files changed, 68 insertions(+), 30 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index c8817e2f0b4..ba8c47942fe 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -233,7 +233,6 @@ 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) @@ -252,6 +251,9 @@ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH(src) +/turf/simulated/floor/holofloor/carpet/get_broken_states() + return list("damaged") + /turf/simulated/floor/holofloor/grass name = "Lush Grass" icon = 'icons/turf/floors/grass.dmi' diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 812a640ac7b..496a9753e5e 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -23,9 +23,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama var/burnt = FALSE var/current_overlay = null var/floor_tile = null //tile that this floor drops - var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") - var/list/burnt_states = list("floorscorched1", "floorscorched2") - var/list/prying_tool_list = list(TOOL_CROWBAR) //What tool/s can we use to pry up the tile? var/keep_dir = TRUE //When false, resets dir to default on changeturf() var/footstep = FOOTSTEP_FLOOR @@ -114,14 +111,14 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama /turf/simulated/floor/break_tile() if(broken) return - current_overlay = pick(broken_states) + current_overlay = pick(get_broken_states()) broken = TRUE update_icon() /turf/simulated/floor/burn_tile() if(burnt) return - current_overlay = pick(burnt_states) + current_overlay = pick(get_burnt_states()) burnt = TRUE update_icon() @@ -209,7 +206,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama if(T.turf_type == type) return var/obj/item/thing = user.get_inactive_hand() - if(!thing || !prying_tool_list.Find(thing.tool_behaviour)) + if(!thing || !(thing.tool_behaviour in get_prying_tools())) return var/turf/simulated/floor/plating/P = pry_tile(thing, user, TRUE) if(!istype(P)) @@ -264,3 +261,12 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama /turf/simulated/floor/can_have_cabling() return !burnt && !broken + +/turf/simulated/floor/proc/get_broken_states() + return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") + +/turf/simulated/floor/proc/get_burnt_states() + return list("floorscorched1", "floorscorched2") + +/turf/simulated/floor/proc/get_prying_tools() + return list(TOOL_CROWBAR) diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index 2294fd1f82c..440f2643f92 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -446,7 +446,6 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me slowdown = 2 environment_type = "snow" planetary_atmos = TRUE - burnt_states = list("snow_dug") digResult = /obj/item/stack/sheet/mineral/snow /turf/simulated/floor/plating/asteroid/snow/burn_tile() @@ -458,6 +457,9 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me return TRUE return FALSE +/turf/simulated/floor/plating/asteroid/snow/get_burnt_states() + return list("snow_dug") + /turf/simulated/floor/plating/asteroid/snow/airless temperature = TCMB oxygen = 0 diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 5a025355fa5..d50da939c83 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -1,8 +1,6 @@ /turf/simulated/floor/wood icon_state = "wood" floor_tile = /obj/item/stack/tile/wood - prying_tool_list = list(TOOL_SCREWDRIVER) - broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") footstep = FOOTSTEP_WOOD barefootstep = FOOTSTEP_WOOD_BAREFOOT clawfootstep = FOOTSTEP_WOOD_CLAW @@ -19,6 +17,12 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return remove_tile(user, FALSE, FALSE) + +/turf/simulated/floor/wood/get_broken_states() + return list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") + +/turf/simulated/floor/wood/get_prying_tools() + return list(TOOL_SCREWDRIVER) /turf/simulated/floor/wood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE) if(broken || burnt) @@ -63,7 +67,6 @@ smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS) canSmoothWith = list(SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS) layer = ABOVE_OPEN_TURF_LAYER - broken_states = list("damaged") floor_tile = /obj/item/stack/tile/grass footstep = FOOTSTEP_GRASS barefootstep = FOOTSTEP_GRASS @@ -71,6 +74,9 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY transform = matrix(1, 0, -9, 0, 1, -9) //Yes, these sprites are 50x50px, big grass control the industry +/turf/simulated/floor/grass/get_broken_states() + return list("damaged") + /turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params) if(..()) return @@ -109,7 +115,6 @@ 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) @@ -146,6 +151,9 @@ /turf/simulated/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) return FALSE +/turf/simulated/floor/carpet/get_broken_states() + return list("damaged") + /turf/simulated/floor/carpet/black icon = 'icons/turf/floors/carpet_black.dmi' floor_tile = /obj/item/stack/tile/carpet/black @@ -213,8 +221,6 @@ icon_state = "mat-0" base_icon_state = "mat" floor_tile = /obj/item/stack/tile/bamboo - prying_tool_list = list(TOOL_SCREWDRIVER) - broken_states = list("bamboo-damaged") smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_BAMBOO) canSmoothWith = list(SMOOTH_GROUP_BAMBOO) @@ -247,6 +253,12 @@ /turf/simulated/floor/bamboo/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) return FALSE +/turf/simulated/floor/bamboo/get_broken_states() + return list("bamboo-damaged") + +/turf/simulated/floor/bamboo/get_prying_tools() + return list(TOOL_SCREWDRIVER) + /turf/simulated/floor/bamboo/airless oxygen = 0 nitrogen = 0 @@ -256,10 +268,12 @@ /turf/simulated/floor/bamboo/tatami desc = "A traditional Japanese floor mat." icon_state = "bamboo-green" - broken_states = list("tatami-damaged") floor_tile = /obj/item/stack/tile/bamboo/tatami smoothing_flags = NONE +/turf/simulated/floor/bamboo/tatami/get_broken_states() + return list("tatami-damaged") + /turf/simulated/floor/bamboo/tatami/purple icon_state = "bamboo-purple" floor_tile = /obj/item/stack/tile/bamboo/tatami/purple @@ -273,7 +287,6 @@ icon = 'icons/turf/space.dmi' icon_state = "0" floor_tile = /obj/item/stack/tile/fakespace - broken_states = list("damaged") smoothing_flags = NONE plane = PLANE_SPACE @@ -281,6 +294,9 @@ . = ..() icon_state = SPACE_ICON_STATE +/turf/simulated/floor/fakespace/get_broken_states() + return list("damaged") + /turf/simulated/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/space.dmi' underlay_appearance.icon_state = SPACE_ICON_STATE diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 5726cc958b9..8268cb51af4 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -3,7 +3,6 @@ light_range = 0 icon_state = "light_off" floor_tile = /obj/item/stack/tile/light - broken_states = list("light_off") /// Are we on var/on = FALSE /// Are we broken @@ -114,6 +113,9 @@ ..() color = color_save +/turf/simulated/floor/light/get_broken_states() + return list("light_off") + // These tiles change color every now and then /turf/simulated/floor/light/disco floor_tile = /obj/item/stack/tile/disco_light diff --git a/code/game/turfs/simulated/floor/mineral_floors.dm b/code/game/turfs/simulated/floor/mineral_floors.dm index 8e0edb6f103..f1fb94e507f 100644 --- a/code/game/turfs/simulated/floor/mineral_floors.dm +++ b/code/game/turfs/simulated/floor/mineral_floors.dm @@ -14,9 +14,8 @@ icon_state = "" var/list/icons = list() -/turf/simulated/floor/mineral/Initialize(mapload) - . = ..() - broken_states = list("[initial(icon_state)]_dam") +/turf/simulated/floor/mineral/get_broken_states() + return list("[initial(icon_state)]_dam") /turf/simulated/floor/mineral/update_icon_state() if(!broken && !burnt) @@ -95,7 +94,9 @@ name = "shuttle floor" icon_state = "titanium" floor_tile = /obj/item/stack/tile/mineral/titanium - broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5") + +/turf/simulated/floor/mineral/titanium/get_broken_states() + return list("titanium_dam1", "titanium_dam2", "titanium_dam3", "titanium_dam4", "titanium_dam5") /turf/simulated/floor/mineral/titanium/airless oxygen = 0 @@ -132,7 +133,9 @@ name = "shuttle floor" icon_state = "plastitanium" floor_tile = /obj/item/stack/tile/mineral/plastitanium - broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5") + +/turf/simulated/floor/mineral/plastitanium/get_broken_states() + return list("plastitanium_dam1", "plastitanium_dam2", "plastitanium_dam3", "plastitanium_dam4", "plastitanium_dam5") /turf/simulated/floor/mineral/plastitanium/red icon_state = "plastitanium_red" diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index a1591d1f312..5bd564b6b78 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -134,10 +134,14 @@ name = "high-traction floor" icon_state = "noslip" floor_tile = /obj/item/stack/tile/noslip - broken_states = list("noslip-damaged1","noslip-damaged2","noslip-damaged3") - burnt_states = list("noslip-scorched1","noslip-scorched2") slowdown = -0.3 +/turf/simulated/floor/noslip/get_broken_states() + return list("noslip-damaged1", "noslip-damaged2", "noslip-damaged3") + +/turf/simulated/floor/plating/asteroid/snow/get_burnt_states() + return list("noslip-scorched1", "noslip-scorched2") + /turf/simulated/floor/noslip/MakeSlippery() return diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 2e8f6935c2c..6911afdce1f 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -1,13 +1,14 @@ /turf/simulated/floor/plasteel icon_state = "floor" floor_tile = /obj/item/stack/tile/plasteel - broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") - burnt_states = list("floorscorched1", "floorscorched2") /turf/simulated/floor/plasteel/update_icon_state() if(!broken && !burnt) icon_state = icon_regular_floor +/turf/simulated/floor/plasteel/get_broken_states() + return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") + /turf/simulated/floor/plasteel/airless name = "airless floor" oxygen = 0 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 2672ed9e734..6fd8d12ffed 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -4,8 +4,6 @@ icon = 'icons/turf/floors/plating.dmi' intact = FALSE floor_tile = null - broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") - burnt_states = list("floorscorched1", "floorscorched2") var/unfastened = FALSE footstep = FOOTSTEP_PLATING barefootstep = FOOTSTEP_HARD_BAREFOOT @@ -19,6 +17,9 @@ icon_plating = icon_state update_icon() +/turf/simulated/floor/plating/get_broken_states() + return list("floorscorched1", "floorscorched2") + /turf/simulated/floor/plating/damaged/Initialize(mapload) . = ..() break_tile() diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm index 2803985e333..ba8a4c85d6c 100644 --- a/code/game/turfs/simulated/floor/transparent.dm +++ b/code/game/turfs/simulated/floor/transparent.dm @@ -123,7 +123,7 @@ /turf/simulated/floor/transparent/glass/try_replace_tile(obj/item/stack/tile/T, mob/user, params) var/obj/item/thing = user.get_inactive_hand() - if(!thing || !prying_tool_list.Find(thing.tool_behaviour)) + if(!thing || !(thing.tool_behaviour in get_prying_tools())) return to_chat(user, "You need to hold two sheets of metal to dismantle \the [src]!") diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 94c5f21a236..c6860510fd8 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -81,8 +81,9 @@ /turf/simulated/floor/vines color = "#aa77aa" icon_state = "vinefloor" - broken_states = list() +/turf/simulated/floor/vines/get_broken_states() + return list() //All of this shit is useless for vines