From af10aaa419bc822c190cbdb510bea1ad3fca1b4e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 12 Oct 2020 00:06:49 +0200 Subject: [PATCH] [MIRROR] Fixes Holodeck Carpets + the Lounge Carpet Area (#1251) * Fixes holocarpet smoothing + fixes holodeck lounge carpet area (#54295) * Fixes Holodeck Carpets + the Lounge Carpet Area Co-authored-by: Kylerace --- _maps/map_files/generic/CentCom.dmm | 10 ++-------- code/modules/holodeck/turfs.dm | 6 ++++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3aaf5a6c63d..17fc95f28bc 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -263,10 +263,7 @@ icon_state = "plant-05"; pixel_y = 10 }, -/turf/open/floor/holofloor{ - dir = 9; - icon_state = "wood" - }, +/turf/open/floor/holofloor/carpet, /area/holodeck/rec_center/lounge) "aW" = ( /obj/effect/turf_decal/tile/green{ @@ -17526,10 +17523,7 @@ "NV" = ( /obj/structure/table/wood, /obj/item/instrument/saxophone, -/turf/open/floor/holofloor{ - dir = 9; - icon_state = "wood" - }, +/turf/open/floor/holofloor/carpet, /area/holodeck/rec_center/lounge) "NZ" = ( /turf/open/floor/holofloor/dark, diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 467292c7874..0b1e7ffc395 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -107,10 +107,12 @@ name = "carpet" desc = "Electrically inviting." icon = 'icons/turf/floors/carpet.dmi' - icon_state = "carpet" + icon_state = "carpet-255" + base_icon_state = "carpet" floor_tile = /obj/item/stack/tile/carpet smoothing_flags = SMOOTH_BITMASK - canSmoothWith = null + smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET) + canSmoothWith = list(SMOOTH_GROUP_CARPET) bullet_bounce_sound = null tiled_dirt = FALSE