diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm index b951de04457..a88c3d470d4 100644 --- a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm +++ b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm @@ -22,6 +22,10 @@ /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"aB" = ( +/obj/structure/closet/crate/wooden/storage_barrel, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "aK" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -66,30 +70,6 @@ /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"bm" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/machinery/smartfridge/drying_rack, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"bn" = ( -/obj/structure/closet/crate/wooden/storage_barrel, -/obj/item/fishing_hook/weighted, -/obj/item/fishing_hook/shiny{ - pixel_y = 4; - pixel_x = -6 - }, -/obj/item/fishing_hook/bone{ - pixel_y = -6 - }, -/obj/item/fishing_line/sinew{ - pixel_x = 10 - }, -/obj/item/fishing_line/sinew{ - pixel_y = 11; - pixel_x = 5 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "bt" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -196,6 +176,17 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"ek" = ( +/obj/structure/rack/wooden, +/obj/item/pickaxe{ + pixel_x = 5 + }, +/obj/item/pickaxe, +/obj/item/pickaxe{ + pixel_x = -5 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "eS" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/mortar{ @@ -223,6 +214,20 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"fk" = ( +/obj/structure/rack/wooden, +/obj/item/fishing_rod/bone{ + pixel_x = -4 + }, +/obj/item/fishing_rod/bone{ + pixel_x = 3 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"fo" = ( +/obj/structure/rack/wooden, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "fr" = ( /obj/structure/railing/wooden_fencing, /turf/open/misc/asteroid/snow/icemoon, @@ -343,21 +348,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"hA" = ( -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/structure/bed/maint, -/obj/item/bedsheet/black/double{ - dir = 1 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"ir" = ( -/obj/structure/wall_torch/spawns_lit/directional/west, -/obj/structure/ore_vein/gold, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "iI" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/garlic, @@ -459,10 +449,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"kF" = ( -/obj/structure/bed/dogbed, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "kM" = ( /obj/structure/bed/maint, /turf/open/misc/dirt/icemoon, @@ -478,6 +464,10 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"kV" = ( +/obj/structure/bed/double/pelt, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "le" = ( /obj/structure/rack/wooden, /obj/item/shield/buckler{ @@ -534,13 +524,6 @@ /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"lT" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/closet/crate/wooden/storage_barrel, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "lZ" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -595,13 +578,9 @@ /obj/structure/millstone, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"mN" = ( +"nb" = ( /obj/structure/wall_torch/spawns_lit/directional/north, -/obj/structure/bed/maint, -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/item/bedsheet/black/double{ +/obj/structure/bed/double/pelt/black{ dir = 1 }, /turf/open/misc/dirt/icemoon, @@ -642,6 +621,25 @@ /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"of" = ( +/obj/structure/closet/crate/wooden/storage_barrel, +/obj/item/fishing_hook/weighted, +/obj/item/fishing_hook/shiny{ + pixel_y = 4; + pixel_x = -6 + }, +/obj/item/fishing_hook/bone{ + pixel_y = -6 + }, +/obj/item/fishing_line/sinew{ + pixel_x = 10 + }, +/obj/item/fishing_line/sinew{ + pixel_y = 11; + pixel_x = 5 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "op" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/fish/chasm_crab/ice{ @@ -725,29 +723,48 @@ /obj/structure/flora/ash/seraka, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"pc" = ( -/obj/item/bedsheet/black{ - pixel_y = 12 - }, -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/structure/bed/dogbed, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "pA" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"pM" = ( +/obj/structure/rack/wooden, +/obj/item/pickaxe{ + pixel_x = -5 + }, +/obj/item/pickaxe, +/obj/item/pickaxe{ + pixel_x = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "qb" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/misc/hay/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"qf" = ( +"qg" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"qh" = ( +/obj/structure/wall_torch/spawns_lit/directional/north, +/turf/open/misc/hay/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"qi" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/mineral_door/wood/large_gate{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"qm" = ( /obj/structure/rack/wooden, /obj/item/stack/sheet/iron/five{ pixel_x = -7 @@ -782,29 +799,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"qg" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"qh" = ( -/obj/structure/wall_torch/spawns_lit/directional/north, -/turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"qi" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/mineral_door/wood/large_gate{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"qk" = ( -/obj/structure/table/wood, -/obj/structure/wall_torch/spawns_lit/directional/north, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "qq" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/soup_pot{ @@ -836,6 +830,10 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"qK" = ( +/obj/structure/closet/crate/wooden/storage_barrel, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "qM" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -858,11 +856,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"ra" = ( -/obj/structure/rack/wooden, -/obj/item/stack/sheet/cloth/ten, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "ru" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -899,26 +892,31 @@ /obj/structure/chair/sofa/bamboo/left, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"rL" = ( -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/item/bedsheet/black{ - dir = 1; - pixel_y = 12 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "rS" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/structure/flora/ash/leaf_shroom, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"rT" = ( +/obj/structure/closet/xenoarch/ashwalker_version, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "rX" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /obj/structure/curtain/bounty, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"rY" = ( +/obj/structure/closet/crate/wooden/storage_barrel, +/obj/item/ammo_casing/arrow/bone, +/obj/item/ammo_casing/arrow/bone, +/obj/item/ammo_casing/arrow/bone, +/obj/item/ammo_casing/arrow, +/obj/item/ammo_casing/arrow, +/obj/item/ammo_casing/arrow, +/obj/item/ammo_casing/arrow, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "sf" = ( /obj/structure/flora/ash/cap_shroom, /turf/open/misc/dirt/icemoon, @@ -929,13 +927,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"sJ" = ( -/obj/structure/bed/maint, -/obj/item/bedsheet/black{ - dir = 1 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "sK" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/misc/dirt/icemoon, @@ -1026,6 +1017,10 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"vp" = ( +/obj/structure/table/wood, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "vq" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/greenbean, @@ -1038,7 +1033,28 @@ /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) "vs" = ( -/obj/structure/geyser, +/obj/structure/rack/wooden, +/obj/item/ore_sensor{ + pixel_y = -1; + pixel_x = -5 + }, +/obj/item/ore_sensor{ + pixel_y = -1; + pixel_x = 5 + }, +/obj/item/ore_sensor{ + pixel_y = 10; + pixel_x = -5 + }, +/obj/item/ore_sensor{ + pixel_y = 10; + pixel_x = 5 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"vu" = ( +/obj/structure/wall_torch/spawns_lit/directional/west, +/obj/structure/ore_vein/gold, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) "vx" = ( @@ -1155,14 +1171,14 @@ /obj/machinery/primitive_stove, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"yv" = ( -/obj/structure/rack/wooden, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "yD" = ( /obj/structure/flora/ash/chilly, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"yE" = ( +/obj/structure/geyser, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "yF" = ( /turf/closed/wall/mineral/stone, /area/ruin/unpowered/primitive_catgirl_den) @@ -1216,6 +1232,11 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"zR" = ( +/obj/structure/table/wood, +/obj/structure/wall_torch/spawns_lit/directional/north, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "zS" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/stack/sheet/iron/ten, @@ -1263,14 +1284,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Br" = ( -/obj/structure/closet/xenoarch/ashwalker_version, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"BK" = ( -/obj/structure/closet/crate/wooden/storage_barrel, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "BO" = ( /obj/structure/railing/wooden_fencing{ dir = 4 @@ -1281,10 +1294,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Cv" = ( -/obj/structure/ore_vein/iron, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "CQ" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -1308,16 +1317,12 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Df" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, +"Da" = ( +/obj/structure/rack/wooden, +/obj/item/stack/sheet/cloth/ten, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Dg" = ( +"Dd" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /obj/structure/rack/wooden, /obj/item/forging/reagent_weapon/axe/fake_copper{ @@ -1330,6 +1335,15 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Df" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Dz" = ( /obj/structure/railing/wooden_fencing/gate{ dir = 4 @@ -1366,6 +1380,10 @@ /obj/effect/spawner/random/lavaland_mob/raptor, /turf/open/misc/hay/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Eq" = ( +/obj/structure/ore_vein/iron, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "EA" = ( /obj/structure/rack/wooden, /obj/item/gun/ballistic/bow/longbow, @@ -1386,6 +1404,12 @@ /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"FJ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/rack/wooden, +/obj/structure/wall_torch/spawns_lit/directional/east, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "FS" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -1430,12 +1454,6 @@ }, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"GE" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/rack/wooden, -/obj/structure/wall_torch/spawns_lit/directional/east, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "GL" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -1456,18 +1474,6 @@ /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Hi" = ( -/obj/machinery/cauldron{ - pixel_y = 9 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Hv" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -1604,27 +1610,12 @@ }, /turf/open/misc/hay/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"JK" = ( -/obj/structure/rack/wooden, -/obj/item/pickaxe{ - pixel_x = -5 - }, -/obj/item/pickaxe, -/obj/item/pickaxe{ - pixel_x = 5 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "JN" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"JW" = ( -/obj/structure/closet/crate/wooden/storage_barrel, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "JX" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -1634,32 +1625,18 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Kd" = ( +/obj/structure/bed/double/pelt/black{ + dir = 1 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "KE" = ( /obj/structure/chair/sofa/bamboo/left{ dir = 1 }, /turf/open/water/hot_spring, /area/ruin/unpowered/primitive_catgirl_den) -"KO" = ( -/obj/structure/rack/wooden, -/obj/item/ore_sensor{ - pixel_y = -1; - pixel_x = -5 - }, -/obj/item/ore_sensor{ - pixel_y = -1; - pixel_x = 5 - }, -/obj/item/ore_sensor{ - pixel_y = 10; - pixel_x = -5 - }, -/obj/item/ore_sensor{ - pixel_y = 10; - pixel_x = 5 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Lj" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1721,6 +1698,18 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Nt" = ( +/obj/machinery/cauldron{ + pixel_y = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Nw" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/flora/ash/seraka, @@ -1770,14 +1759,6 @@ /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"OM" = ( -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/structure/bed/maint, -/obj/item/bedsheet/black/double, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "OR" = ( /obj/structure/chair/sofa/bamboo/right{ dir = 1 @@ -1828,16 +1809,6 @@ }, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"PH" = ( -/obj/structure/rack/wooden, -/obj/item/fishing_rod/bone{ - pixel_x = -4 - }, -/obj/item/fishing_rod/bone{ - pixel_x = 3 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "PO" = ( /obj/structure/table/wood, /obj/item/kitchen/rollingpin{ @@ -1905,6 +1876,11 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"RG" = ( +/obj/structure/rack/wooden, +/obj/item/stack/sheet/cloth/ten, +/turf/open/floor/wood/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "RO" = ( /obj/structure/flora/ash/leaf_shroom, /turf/open/misc/dirt/icemoon, @@ -1950,15 +1926,6 @@ "Sc" = ( /turf/open/misc/hay/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Sf" = ( -/obj/structure/rack/wooden, -/obj/item/stack/sheet/cloth/ten, -/turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) -"SF" = ( -/obj/structure/table/wood, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "SG" = ( /obj/structure/railing/wooden_fencing{ dir = 4 @@ -1972,16 +1939,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Ti" = ( -/obj/structure/bed/maint, -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/item/bedsheet/black/double{ - dir = 1 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Tj" = ( /obj/structure/chair/sofa/bamboo/right, /turf/open/water/hot_spring, @@ -2005,6 +1962,10 @@ }, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"TK" = ( +/obj/structure/bed/double/pelt/black, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Ug" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, @@ -2104,17 +2065,6 @@ /obj/structure/chair/wood, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"VT" = ( -/obj/structure/closet/crate/wooden/storage_barrel, -/obj/item/ammo_casing/arrow/bone, -/obj/item/ammo_casing/arrow/bone, -/obj/item/ammo_casing/arrow/bone, -/obj/item/ammo_casing/arrow, -/obj/item/ammo_casing/arrow, -/obj/item/ammo_casing/arrow, -/obj/item/ammo_casing/arrow, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "WM" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 @@ -2160,22 +2110,16 @@ }, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"XJ" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/machinery/smartfridge/drying_rack, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "XK" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /obj/structure/closet/crate/wooden/storage_barrel, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Yf" = ( -/obj/structure/rack/wooden, -/obj/item/pickaxe{ - pixel_x = 5 - }, -/obj/item/pickaxe, -/obj/item/pickaxe{ - pixel_x = -5 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Yj" = ( /obj/structure/rack/wooden, /obj/item/cultivator/rake, @@ -2185,6 +2129,13 @@ /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Yn" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/closet/crate/wooden/storage_barrel, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "YE" = ( /obj/structure/railing/wooden_fencing, /obj/structure/stairs/wood{ @@ -2451,7 +2402,7 @@ pa pa pb je -vs +yE yF pa yF @@ -2490,7 +2441,7 @@ oJ yF yF yF -VT +rY ZJ qg Vb @@ -2507,7 +2458,7 @@ gt wp Te qg -ir +vu oJ PB Yj @@ -2711,7 +2662,7 @@ yF GN GN yF -lT +Yn RU yK qu @@ -2723,7 +2674,7 @@ ZJ ZJ ZJ qg -vs +yE pa oJ oJ @@ -2753,7 +2704,7 @@ GN GN GN GN -SF +vp Cs ch Te @@ -2795,7 +2746,7 @@ yF GN GN yF -qk +zR Zy qt RU @@ -2829,7 +2780,7 @@ yF GN yF PG -Sf +RG ou GU gd @@ -2839,8 +2790,8 @@ GN GN mB Zq -BK -GE +aB +FJ oJ Vb hp @@ -2926,7 +2877,7 @@ GN GN GN pa -Cv +Eq yF oJ Vb @@ -3253,8 +3204,8 @@ GN ZJ ZJ GN -bn -PH +of +fk ZJ ZJ ZJ @@ -3269,9 +3220,9 @@ oJ Vb oJ yF -VT -ra -Br +rY +Da +rT yF oJ oJ @@ -3339,7 +3290,7 @@ RC yF yF yF -mN +nb ZJ XK yF @@ -3384,7 +3335,7 @@ oX ZJ ZJ ZJ -rL +kV pa GN oJ @@ -3422,11 +3373,11 @@ mu sf GN pa -hA +kV ZJ -Ti +kV ZJ -sJ +TK pa oJ Vb @@ -3464,11 +3415,11 @@ yF GN GN pa -kF +Kd ZJ -pc +Kd ZJ -OM +kV pa oJ oJ @@ -3666,7 +3617,7 @@ qg Vb yD oJ -JK +pM Ve vW Vb @@ -3806,7 +3757,7 @@ gY wM ZJ pa -bm +XJ oJ oJ sS @@ -3827,13 +3778,13 @@ oJ oJ oJ pa -Yf +ek EA yF ZJ -KO +vs pa -JW +qK yD oJ yF @@ -3884,7 +3835,7 @@ bT su cs pa -Hi +Nt GU Xv su @@ -3958,15 +3909,15 @@ pa uH uH GL -Dg +Dd yF -yv +fo Vb nn qM qM aK -qf +qm pa PO oK diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_upper.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_upper.dmm index 184202a6713..902865d6a80 100644 --- a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_upper.dmm +++ b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_upper.dmm @@ -24,6 +24,10 @@ /obj/structure/sign/flag, /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/unpowered/primitive_catgirl_den) +"bu" = ( +/obj/structure/rack/wooden, +/turf/open/floor/wood/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "bJ" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -98,6 +102,12 @@ }, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"di" = ( +/obj/structure/wall_torch/spawns_lit/directional/west, +/obj/structure/curtain/bounty, +/obj/structure/bed/double/pelt, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "dk" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -259,20 +269,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"lR" = ( -/obj/structure/closet/crate/wooden/storage_barrel, -/obj/item/crowbar/ashwalker, -/obj/item/crowbar/ashwalker{ - pixel_y = -4 - }, -/obj/item/crowbar/ashwalker{ - pixel_y = 5 - }, -/obj/item/wrench/ashwalker, -/obj/item/wrench/ashwalker, -/obj/item/wrench/ashwalker, -/turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "mk" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -282,21 +278,12 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"ml" = ( -/obj/structure/rack/wooden, -/turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "mm" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"mD" = ( -/obj/structure/bed/maint, -/obj/structure/curtain/bounty, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "mH" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 @@ -334,13 +321,6 @@ /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"nC" = ( -/obj/structure/wall_torch/spawns_lit/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "nV" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -412,15 +392,6 @@ }, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"oA" = ( -/obj/structure/wall_torch/spawns_lit/directional/east, -/obj/structure/bed/maint{ - pixel_y = 13 - }, -/obj/structure/bed/maint, -/obj/structure/curtain/bounty, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "pa" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -517,15 +488,18 @@ "qQ" = ( /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"qW" = ( +"ry" = ( /obj/structure/closet/crate/wooden/storage_barrel, -/obj/item/screwdriver/ashwalker, -/obj/item/screwdriver/ashwalker, -/obj/item/screwdriver/ashwalker, -/obj/item/wirecutters/ashwalker, -/obj/item/wirecutters/ashwalker, -/obj/item/wirecutters/ashwalker, -/obj/item/weldingtool/mini, +/obj/item/crowbar/ashwalker, +/obj/item/crowbar/ashwalker{ + pixel_y = -4 + }, +/obj/item/crowbar/ashwalker{ + pixel_y = 5 + }, +/obj/item/wrench/ashwalker, +/obj/item/wrench/ashwalker, +/obj/item/wrench/ashwalker, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) "rC" = ( @@ -564,6 +538,20 @@ }, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"tx" = ( +/obj/structure/wall_torch/spawns_lit/directional/west, +/obj/structure/rack/wooden, +/turf/open/floor/wood/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) +"tB" = ( +/obj/structure/rack/wooden, +/obj/item/reagent_containers/cup/bucket/wooden, +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_y = -3; + pixel_x = 8 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "ua" = ( /turf/open/openspace/icemoon, /area/ruin/unpowered/primitive_catgirl_den) @@ -577,10 +565,6 @@ /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"uH" = ( -/obj/structure/geyser, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "uO" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -670,10 +654,11 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"yi" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/geyser, -/turf/open/misc/dirt/icemoon, +"zr" = ( +/obj/structure/wall_torch/spawns_lit/directional/east, +/obj/structure/curtain/bounty, +/obj/structure/bed/double/pelt, +/turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) "Ad" = ( /obj/effect/turf_decal/siding/wood{ @@ -762,12 +747,6 @@ }, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Bb" = ( -/obj/structure/wall_torch/spawns_lit/directional/west, -/obj/structure/bed/maint, -/obj/structure/curtain/bounty, -/turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Bt" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -863,6 +842,17 @@ }, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Gi" = ( +/obj/structure/closet/crate/wooden/storage_barrel, +/obj/item/screwdriver/ashwalker, +/obj/item/screwdriver/ashwalker, +/obj/item/screwdriver/ashwalker, +/obj/item/wirecutters/ashwalker, +/obj/item/wirecutters/ashwalker, +/obj/item/wirecutters/ashwalker, +/obj/item/weldingtool/mini, +/turf/open/floor/wood/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Go" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -930,6 +920,11 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Jw" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/geyser, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "JC" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -937,6 +932,13 @@ /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"JT" = ( +/obj/structure/wall_torch/spawns_lit/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/misc/dirt/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Kc" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/asteroid/snow/icemoon, @@ -963,6 +965,11 @@ /obj/structure/railing/wooden_fencing, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/primitive_catgirl_den) +"Lr" = ( +/obj/structure/curtain/bounty, +/obj/structure/bed/double/pelt, +/turf/open/floor/stone/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "LM" = ( /obj/item/food/grown/aloe{ pixel_x = 5 @@ -1033,15 +1040,6 @@ }, /turf/open/misc/dirt/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Op" = ( -/obj/structure/rack/wooden, -/obj/item/reagent_containers/cup/bucket/wooden, -/obj/item/reagent_containers/cup/bucket/wooden{ - pixel_y = -3; - pixel_x = 8 - }, -/turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "Ou" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/misc/asteroid/snow/icemoon, @@ -1295,6 +1293,10 @@ "Va" = ( /turf/closed/wall/mineral/stone, /area/ruin/unpowered/primitive_catgirl_den) +"Vj" = ( +/obj/structure/geyser, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/unpowered/primitive_catgirl_den) "Vv" = ( /obj/structure/sign/flag, /turf/closed/wall/mineral/stone, @@ -1334,11 +1336,6 @@ }, /turf/open/openspace/icemoon, /area/ruin/unpowered/primitive_catgirl_den) -"Xz" = ( -/obj/structure/wall_torch/spawns_lit/directional/west, -/obj/structure/rack/wooden, -/turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) "XA" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1777,7 +1774,7 @@ ua Va Va cZ -ml +bu HF Va Va @@ -1821,7 +1818,7 @@ Tu xM xM MD -Xz +tx gG LW LW @@ -2200,14 +2197,14 @@ TM Va Va NA -mD +Lr lv Va Kg Kg Kg Va -Op +tB NX pQ Va @@ -2240,7 +2237,7 @@ LW nd LW gG -Bb +di cA cA cA @@ -2248,7 +2245,7 @@ gS iu mm mm -nC +JT BZ Pr qQ @@ -2320,11 +2317,11 @@ Yn Yn ua rT -uH +Vj LW LW gG -oA +zr cA qg Kg @@ -2375,7 +2372,7 @@ bc Kg AL Va -yi +Jw Qi pk Va @@ -2994,7 +2991,7 @@ gG gG gG Va -lR +ry vD ob gG @@ -3080,7 +3077,7 @@ PK ua ua AT -qW +Gi im ua ua diff --git a/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm b/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm index 929553b9a3a..cf7811ffd44 100644 --- a/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm +++ b/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm @@ -88,3 +88,57 @@ ) result = /obj/item/clothing/suit/armor/handcrafted_hearthkin_armor + +// Hearthkin Exclusive Beds +/obj/structure/bed/double/pelt + name = "white pelts bed" + desc = "A luxurious double bed, made with white wolf pelts." + icon_state = "pelt_bed_white" + icon = 'modular_nova/modules/tribal_extended/icons/tribal_beds.dmi' + anchored = TRUE + can_buckle = TRUE + buckle_lying = 90 + resistance_flags = FLAMMABLE + max_integrity = 100 + integrity_failure = 0.35 + max_buckled_mobs = 2 + /// What material this bed is made of + build_stack_type = /obj/item/stack/sheet/sinew/wolf + /// How many mats to drop when deconstructed + build_stack_amount = 4 + +/obj/structure/bed/double/pelt/atom_deconstruct(disassembled = TRUE) + . = ..() + new /obj/item/stack/sheet/mineral/wood(loc, build_stack_amount) + +/datum/crafting_recipe/white_pelt_bed + name = "White Pelts Bed" + category = CAT_FURNITURE + //recipe given to icecats as part of their spawner/team setting + crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND + + reqs = list( + /obj/item/stack/sheet/sinew/wolf = 4, + /obj/item/stack/sheet/mineral/wood = 4, + ) + + result = /obj/structure/bed/double/pelt + +/obj/structure/bed/double/pelt/black + name = "black pelts bed" + desc = "A luxurious double bed, made with black wolf pelts." + icon_state = "pelt_bed_black" + icon = 'modular_nova/modules/tribal_extended/icons/tribal_beds.dmi' + +/datum/crafting_recipe/black_pelt_bed + name = "Black Pelts Bed" + category = CAT_FURNITURE + //recipe given to icecats as part of their spawner/team setting + crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND + + reqs = list( + /obj/item/stack/sheet/sinew/wolf = 4, + /obj/item/stack/sheet/mineral/wood = 4, + ) + + result = /obj/structure/bed/double/pelt/black diff --git a/modular_nova/modules/primitive_catgirls/code/spawner.dm b/modular_nova/modules/primitive_catgirls/code/spawner.dm index 49964ce6259..dbdcdc59ba7 100644 --- a/modular_nova/modules/primitive_catgirls/code/spawner.dm +++ b/modular_nova/modules/primitive_catgirls/code/spawner.dm @@ -292,6 +292,8 @@ /datum/crafting_recipe/bonedagger, /datum/crafting_recipe/anointing_oil, /datum/crafting_recipe/handcrafted_hearthkin_armor, + /datum/crafting_recipe/black_pelt_bed, + /datum/crafting_recipe/white_pelt_bed, ) /datum/antagonist/primitive_catgirl/Destroy() diff --git a/modular_nova/modules/tribal_extended/icons/tribal_beds.dmi b/modular_nova/modules/tribal_extended/icons/tribal_beds.dmi new file mode 100644 index 00000000000..5cf448001e5 Binary files /dev/null and b/modular_nova/modules/tribal_extended/icons/tribal_beds.dmi differ