From 09066e82ca2bf26ad8d88492456ef7084a75e95f Mon Sep 17 00:00:00 2001 From: Sable <102194057+Thlumyn@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:11:02 -0700 Subject: [PATCH] Ghost cafe turf fixes (#161) * change shelves to nova filepath * replace bathroom turf * adds in sec drobe I accidentally removed. * replace carpet with indestructible * apparently our carpet sprites arent cut for smoothing --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 246 ++++-------------- .../modules/ghostcafe/code/ghostcafeturf.dm | 19 ++ 2 files changed, 76 insertions(+), 189 deletions(-) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index ad1baba7504..540adbbfb4b 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -310,12 +310,7 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "ahk" = ( -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "ahs" = ( /obj/structure/flora/bush/leavy/style_2, @@ -363,7 +358,7 @@ /obj/machinery/door/airlock{ id_tag = "CCD2" }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "ahQ" = ( /obj/structure/flora/bush/sparsegrass, @@ -475,12 +470,7 @@ color = "#B22222"; name = "Curtain" }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "ajK" = ( /obj/structure/flora/rock/pile{ @@ -592,12 +582,7 @@ "alk" = ( /obj/item/bedsheet/dorms_double, /obj/structure/bed/double, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "alm" = ( /obj/effect/turf_decal/tile/blue{ @@ -776,7 +761,7 @@ /turf/open/floor/iron/freezer, /area/centcom/holding/cafe) "amF" = ( -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "amG" = ( /obj/structure/chair/sofa/corp/left, @@ -1115,7 +1100,7 @@ }, /obj/structure/bed/double/pod, /obj/item/bedsheet/dorms_double, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aqy" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe/ghost_cafe, @@ -1221,12 +1206,7 @@ "asz" = ( /obj/structure/table/wood/fancy/blue, /obj/machinery/light/directional/north, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "asC" = ( /obj/effect/turf_decal/tile/blue{ @@ -1645,11 +1625,7 @@ light_range = 10; nightshift_light_power = 10 }, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "axF" = ( /obj/structure/bed/dogbed, @@ -2064,12 +2040,7 @@ /obj/structure/mirror{ pixel_y = 32 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aAY" = ( /obj/effect/turf_decal/tile/blue{ @@ -2150,7 +2121,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aBH" = ( /obj/effect/turf_decal/tile/neutral{ @@ -2173,7 +2144,7 @@ /area/centcom/holding/cafe) "aBT" = ( /obj/structure/table/wood, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aBW" = ( /obj/machinery/hydroponics/constructable, @@ -3260,11 +3231,7 @@ light_range = 10; nightshift_light_power = 10 }, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafedorms) "aOZ" = ( /obj/machinery/light/directional/north, @@ -3285,14 +3252,6 @@ /obj/structure/sink/directional/west, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) -"aPx" = ( -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, -/area/centcom/holding/cafe) "aPC" = ( /obj/structure/railing{ invisibility = 100; @@ -3434,12 +3393,7 @@ /obj/structure/fireplace{ dir = 4 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aQR" = ( /obj/effect/turf_decal/stripes/line{ @@ -3540,11 +3494,7 @@ /obj/structure/toilet{ pixel_y = 14 }, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "aRC" = ( /obj/machinery/light/directional/north, @@ -3824,7 +3774,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aUw" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -3926,11 +3876,7 @@ /area/centcom/holding/cafepark) "aVC" = ( /obj/machinery/shower/directional/west, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafedorms) "aVI" = ( /obj/structure/fake_stairs/directional/east, @@ -4820,7 +4766,7 @@ /obj/structure/chair/sofa/corp{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "bQZ" = ( /obj/structure/reagent_dispensers/plumbed, @@ -4858,12 +4804,7 @@ /obj/structure/fireplace{ dir = 8 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "bTR" = ( /obj/structure/table/reinforced, @@ -4979,7 +4920,7 @@ /area/centcom/interlink) "bZt" = ( /obj/structure/chair/sofa/corp/corner, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "cal" = ( /obj/structure/railing{ @@ -5094,7 +5035,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "cmh" = ( /obj/effect/turf_decal/siding{ @@ -5351,7 +5292,7 @@ /obj/structure/sign/painting/library_secure{ pixel_x = 32 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "cHY" = ( /obj/effect/turf_decal/weather/dirt{ @@ -5584,11 +5525,7 @@ /obj/structure/toilet{ pixel_y = 14 }, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "dbZ" = ( /obj/effect/turf_decal/weather/dirt{ @@ -5782,7 +5719,7 @@ /obj/structure/chair/sofa/corp/corner{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "dzn" = ( /obj/structure/fence{ @@ -5827,7 +5764,7 @@ /area/centcom/interlink) "dDF" = ( /obj/structure/chair/sofa/corp, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "dFj" = ( /obj/machinery/door/airlock/medical/glass{ @@ -6067,7 +6004,7 @@ id_tag = "CCD1" }, /obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "dXe" = ( /obj/structure/flora/grass/jungle/b/style_2, @@ -7009,7 +6946,7 @@ /area/centcom/interlink) "fPs" = ( /obj/item/kirbyplants/random, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "fQt" = ( /mob/living/basic/crab{ @@ -7522,7 +7459,7 @@ /area/centcom/holding/cafepark) "gPD" = ( /obj/structure/rack/shelf{ - icon = 'modular_skyrat/modules/mapping/icons/unique/furniture.dmi'; + icon = 'modular_nova/modules/mapping/icons/unique/furniture.dmi'; icon_state = "empty_shelf_1" }, /obj/item/reagent_containers/cup/bucket/wooden, @@ -7647,12 +7584,7 @@ /obj/structure/dresser{ pixel_y = 7 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "hbE" = ( /obj/structure/fence/interlink{ @@ -8456,7 +8388,7 @@ /area/centcom/interlink) "ioZ" = ( /obj/machinery/light/directional/east, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "ipc" = ( /obj/structure/sign/poster/random/directional/east, @@ -8598,11 +8530,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/thinplating_new/end, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "iCz" = ( /obj/structure/fans/tiny/invisible, @@ -9346,7 +9274,7 @@ "jYf" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "jYy" = ( /obj/effect/turf_decal/sand, @@ -10037,7 +9965,7 @@ /area/centcom/holding/cafepark) "lgm" = ( /obj/structure/rack/shelf{ - icon = 'modular_skyrat/modules/mapping/icons/unique/furniture.dmi'; + icon = 'modular_nova/modules/mapping/icons/unique/furniture.dmi'; icon_state = "empty_shelf_1" }, /obj/structure/stone_tile/slab, @@ -11267,12 +11195,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 8 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "nii" = ( /obj/structure/fireplace, @@ -11429,12 +11352,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 8 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "npe" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, @@ -12299,7 +12217,7 @@ /area/centcom/interlink) "oSG" = ( /obj/structure/rack/shelf{ - icon = 'modular_skyrat/modules/mapping/icons/unique/furniture.dmi'; + icon = 'modular_nova/modules/mapping/icons/unique/furniture.dmi'; icon_state = "empty_shelf_1" }, /obj/item/bedsheet/black{ @@ -12391,7 +12309,7 @@ dir = 4 }, /obj/machinery/light/directional/west, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "pao" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -12412,7 +12330,7 @@ specialfunctions = 4 }, /obj/item/kirbyplants/random, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "pbz" = ( /obj/effect/turf_decal/tile/blue{ @@ -13017,12 +12935,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 4 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "pTO" = ( /obj/structure/table/reinforced, @@ -13192,12 +13105,7 @@ /area/centcom/interlink) "qfy" = ( /obj/structure/table/wood/fancy/blue, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "qgh" = ( /obj/structure/stone_tile/surrounding, @@ -13509,8 +13417,8 @@ /turf/open/floor/iron/white, /area/centcom/interlink) "qGA" = ( -/obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/iron/dark, /area/centcom/holding/cafe) "qGW" = ( @@ -13522,12 +13430,7 @@ /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/lighter, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "qHJ" = ( /obj/structure/extinguisher_cabinet/directional/north, @@ -13629,7 +13532,7 @@ /obj/structure/chair/sofa/corp{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "qQl" = ( /obj/machinery/light/directional/south, @@ -13711,11 +13614,7 @@ /area/centcom/holding/cafepark) "qWc" = ( /obj/machinery/shower/directional/west, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "qWv" = ( /obj/effect/turf_decal/tile/blue{ @@ -14589,12 +14488,7 @@ }, /obj/structure/bed/double, /obj/item/bedsheet/dorms_double, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "ssn" = ( /obj/machinery/status_display/shuttle{ @@ -14665,11 +14559,7 @@ "sys" = ( /obj/machinery/shower/directional/west, /obj/structure/sink/directional/south, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "sAC" = ( /obj/effect/turf_decal/box, @@ -15164,11 +15054,7 @@ /turf/open/floor/fakebasalt, /area/centcom/holding/cafepark) "tky" = ( -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafe) "tlu" = ( /obj/effect/turf_decal/siding/wood{ @@ -15330,7 +15216,7 @@ /area/centcom/interlink) "tDj" = ( /obj/structure/rack/shelf{ - icon = 'modular_skyrat/modules/mapping/icons/unique/furniture.dmi'; + icon = 'modular_nova/modules/mapping/icons/unique/furniture.dmi'; icon_state = "empty_shelf_1" }, /obj/structure/wall_torch/spawns_lit/directional/west, @@ -16262,11 +16148,7 @@ /obj/structure/mirror{ pixel_y = 32 }, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafedorms) "vui" = ( /obj/effect/turf_decal/siding/wood{ @@ -16589,12 +16471,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafepark) "vZv" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -16896,11 +16773,7 @@ /area/centcom/holding/cafepark) "wBX" = ( /obj/structure/sink/directional/south, -/turf/open/indestructible/hoteltile{ - icon = 'modular_skyrat/modules/ghostcafe/icons/floors.dmi'; - icon_state = "titanium_blue_old"; - name = "bathroom floor" - }, +/turf/open/indestructible/bathroom, /area/centcom/holding/cafedorms) "wCl" = ( /obj/item/kirbyplants/random, @@ -17241,7 +17114,7 @@ light_power = 10; name = "Super Light" }, -/turf/open/floor/carpet/royalblack, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "xgz" = ( /obj/effect/turf_decal/siding/wood{ @@ -17634,12 +17507,7 @@ /obj/structure/sign/painting/library_secure{ pixel_y = -32 }, -/turf/open/indestructible/hotelwood{ - desc = "It's really cozy! Great for soft paws!"; - icon = 'modular_skyrat/modules/ghostcafe/icons/carpet_royalblack.dmi'; - icon_state = "carpet"; - name = "soft carpet" - }, +/turf/open/indestructible/carpet, /area/centcom/holding/cafe) "xRx" = ( /obj/item/stack/sheet/mineral/wood/fifty, @@ -57613,8 +57481,8 @@ aFP aqf qWc axD -aPx -aPx +amF +amF alk sQj atp @@ -64559,8 +64427,8 @@ lwv aqf aRx axD -aPx -aPx +amF +amF qHc aqf tgU @@ -64816,7 +64684,7 @@ tzR aqf qWc aqf -aPx +amF bTK xQK aqf diff --git a/modular_nova/modules/ghostcafe/code/ghostcafeturf.dm b/modular_nova/modules/ghostcafe/code/ghostcafeturf.dm index b879a8ec37b..3e3c4fe7f87 100644 --- a/modular_nova/modules/ghostcafe/code/ghostcafeturf.dm +++ b/modular_nova/modules/ghostcafe/code/ghostcafeturf.dm @@ -13,3 +13,22 @@ name = "nitrogen-filled plating" desc = "Vox box certified." initial_gas_mix = "n2=104;TEMP=293.15" + +/turf/open/indestructible/bathroom + icon = 'modular_nova/modules/ghostcafe/icons/floors.dmi'; + icon_state = "titanium_blue_old"; + name = "bathroom floor" + footstep = FOOTSTEP_FLOOR + tiled_dirt = FALSE + +/turf/open/indestructible/carpet + desc = "It's really cozy! Great for soft paws!"; + icon = 'modular_nova/modules/ghostcafe/icons/carpet_royalblack.dmi'; + icon_state = "carpet"; + name = "soft carpet" + bullet_bounce_sound = null + footstep = FOOTSTEP_CARPET + barefootstep = FOOTSTEP_CARPET_BAREFOOT + clawfootstep = FOOTSTEP_CARPET_BAREFOOT + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE