From 220b8f224c9822cb56e5be28b649565dd868a51d Mon Sep 17 00:00:00 2001 From: Sonoida Date: Sat, 17 Dec 2022 20:27:27 +0100 Subject: [PATCH] added double beds to maps that's about it --- _maps/map_files/BoxStation/BoxStation.dmm | 6 +++--- _maps/map_files/MetaStation/MetaStation.dmm | 6 +++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 16 ++++++---------- code/game/objects/structures/beds_chairs/bed.dm | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 309a77cd..ed6b93f1 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1125,8 +1125,8 @@ "avH" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness) "avI" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/structure/table,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness) "avJ" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "1stclassprivacy"; name = "privacy shutters"},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) -"avK" = (/obj/structure/bed,/obj/machinery/button/door{id = "Dorm5"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/wood,/area/crew_quarters/dorms) -"avL" = (/obj/structure/bed,/obj/machinery/button/door{id = "Dorm6"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/wood,/area/crew_quarters/dorms) +"avK" = (/obj/machinery/button/door{id = "Dorm5"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/item/bedsheet/double_red,/obj/structure/double_bed,/turf/open/floor/wood,/area/crew_quarters/dorms) +"avL" = (/obj/machinery/button/door{id = "Dorm6"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/structure/double_bed,/obj/item/bedsheet/double_blue,/turf/open/floor/wood,/area/crew_quarters/dorms) "avM" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/door/poddoor/shutters/preopen{id = "Holodeckshutter"; name = "Holodeck Shutter"},/turf/open/floor/plating,/area/crew_quarters/fitness) "avN" = (/obj/effect/decal/cleanable/cobweb/cobweb2,/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating,/area/maintenance/starboard/fore) "avO" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/starboard/fore) @@ -6368,7 +6368,7 @@ "ctu" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plating,/area/maintenance/port/aft) "ctv" = (/obj/machinery/door/airlock/maintenance/abandoned{req_access_txt = "12"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/port/aft) "ctw" = (/obj/item/restraints/handcuffs/fake,/turf/open/floor/plating,/area/maintenance/bar) -"ctx" = (/obj/structure/bed,/obj/item/tank/internals/anesthetic,/obj/item/clothing/mask/breath,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/plating,/area/maintenance/bar) +"ctx" = (/obj/item/tank/internals/anesthetic,/obj/item/clothing/mask/breath,/obj/structure/double_bed,/obj/item/bedsheet/double_gato,/turf/open/floor/plating,/area/maintenance/bar) "cty" = (/obj/item/electropack/shockcollar,/obj/item/assembly/signaler,/turf/open/floor/plating,/area/maintenance/bar) "ctz" = (/obj/machinery/vending/autodrobe,/turf/open/floor/wood,/area/maintenance/bar) "ctA" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/maintenance/port/aft) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 024a48ca..d8050017 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1006,7 +1006,7 @@ "atL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/open/floor/plating,/area/maintenance/fore) "atM" = (/obj/machinery/light/small{dir = 1},/obj/structure/table/wood,/obj/machinery/newscaster{pixel_y = 32},/obj/item/lighter,/turf/open/floor/wood,/area/crew_quarters/dorms) "atN" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/airalarm{pixel_y = 23},/turf/open/floor/wood,/area/crew_quarters/dorms) -"atO" = (/obj/machinery/button/door{id = "Cabin3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb/cobweb2,/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/wood,/area/crew_quarters/dorms) +"atO" = (/obj/machinery/button/door{id = "Cabin3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb/cobweb2,/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/structure/double_bed,/obj/item/bedsheet/double_blue,/turf/open/floor/wood,/area/crew_quarters/dorms) "atP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/closed/wall,/area/crew_quarters/dorms) "atQ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "atR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/dorms) @@ -1195,7 +1195,7 @@ "axt" = (/obj/machinery/camera{c_tag = "Interrogation room"; dir = 8; network = list("interrogation")},/turf/open/floor/plasteel/dark,/area/security/brig) "axu" = (/obj/structure/reagent_dispensers/watertank,/obj/item/storage/box/lights/mixed,/turf/open/floor/plating,/area/maintenance/fore) "axv" = (/obj/machinery/light/small{dir = 1},/obj/machinery/newscaster{pixel_y = 32},/obj/structure/dresser,/turf/open/floor/carpet,/area/crew_quarters/dorms) -"axw" = (/obj/machinery/button/door{id = "Cabin2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/carpet,/area/crew_quarters/dorms) +"axw" = (/obj/machinery/button/door{id = "Cabin2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/structure/double_bed,/obj/item/bedsheet/double_red,/turf/open/floor/carpet,/area/crew_quarters/dorms) "axx" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/camera{c_tag = "Dormitories - Fore"; dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/crew_quarters/dorms) "axy" = (/obj/machinery/button/door{id = "Cabin5"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/wood,/area/crew_quarters/dorms) "axz" = (/obj/machinery/newscaster{pixel_y = 32},/obj/structure/table/wood,/obj/item/paper,/turf/open/floor/wood,/area/crew_quarters/dorms) @@ -1815,7 +1815,7 @@ "aJp" = (/obj/structure/closet/wardrobe/pjs,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/sign/poster/official/random{pixel_y = -32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) "aJq" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/item/clothing/suit/hooded/wintercoat,/obj/item/clothing/shoes/winterboots,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) "aJr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/wardrobe/pjs,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) -"aJs" = (/obj/machinery/button/door{id = "Cabin7"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/wood,/area/crew_quarters/dorms) +"aJs" = (/obj/machinery/button/door{id = "Cabin7"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/structure/double_bed,/obj/item/bedsheet/double_gato,/turf/open/floor/wood,/area/crew_quarters/dorms) "aJt" = (/obj/structure/chair/wood/normal{dir = 4},/turf/open/floor/wood,/area/crew_quarters/dorms) "aJu" = (/obj/structure/table/wood,/obj/machinery/newscaster{pixel_x = 29; pixel_y = 1},/obj/item/paper,/turf/open/floor/wood,/area/crew_quarters/dorms) "aJv" = (/obj/structure/closet,/obj/item/storage/box/donkpockets,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/starboard/fore) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 8e87f3de..b6bcf3dd 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -10800,13 +10800,13 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "ave" = ( -/obj/structure/bed, /obj/machinery/button/door{ id = "Dorm3Shutters"; name = "Privacy Shutters Control"; pixel_y = 26 }, -/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/double_bed, +/obj/item/bedsheet/double_gato, /turf/open/floor/wood, /area/crew_quarters/dorms) "avf" = ( @@ -11463,17 +11463,13 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "awo" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, +/turf/open/floor/wood, /area/crew_quarters/dorms) "awp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, +/turf/open/floor/wood, /area/crew_quarters/dorms) "awq" = ( /obj/effect/spawner/structure/window/reinforced, @@ -12298,14 +12294,14 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "ayj" = ( -/obj/structure/bed, /obj/machinery/button/door{ id = "Dorm2Shutters"; name = "Privacy Shutters Control"; pixel_y = 26; req_access_txt = "0" }, -/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/double_bed, +/obj/item/bedsheet/double_red, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayk" = ( diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index b51230ec..4c4c53de 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -30,7 +30,7 @@ anchored = TRUE can_buckle = TRUE buckle_lying = TRUE - resistance_flags = FLAMMABLE + resistance_flags = NONE max_integrity = 100 integrity_failure = 30 var/buildstacktype = /obj/item/stack/sheet/metal