diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index c3c5ae2a121..4cc31bca411 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1585,7 +1585,7 @@ /area/ruin/syndicate_lava_base/bar) "mA" = ( /obj/machinery/light/small/directional/west, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/item/reagent_containers/blood/o_minus, /obj/machinery/firealarm/directional/west, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm index 2639f59e520..4b4daf0586b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm @@ -2,18 +2,6 @@ "aa" = ( /turf/template_noop, /area/template_noop) -"ab" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/mob/living/carbon/human/species/monkey{ - faction = list("neutral","Syndicate") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "ac" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -29,14 +17,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"ad" = ( -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs, -/obj/item/taperecorder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "ae" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -45,19 +25,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"af" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "ag" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, @@ -79,12 +46,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) "ak" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -95,14 +56,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"al" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "am" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/machinery/door/firedoor, @@ -134,35 +87,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) -"ar" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi"; - name = "Syndicate Research Experimentation Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ruin/syndicate_lava_base/testlab) -"as" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) "at" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -186,45 +110,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) -"ax" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) -"ay" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) -"az" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "aA" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -252,12 +139,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) "aD" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/syndicate_lava_base/testlab) @@ -274,27 +155,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aF" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/hatch{ - name = "Experimentation Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/structure/cable, -/obj/modular_map_connector, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) -"aG" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes/syndicate, -/obj/item/storage/box/monkeycubes/syndicate, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "aH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, @@ -312,11 +172,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) -"aK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) "aL" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, @@ -352,16 +207,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/ruin/syndicate_lava_base/testlab) -"aR" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/syndicate_lava_base/testlab) "aS" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine, @@ -377,20 +222,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/ruin/syndicate_lava_base/testlab) -"aU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) -"aV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/syndicate_lava_base/testlab) "aW" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, @@ -408,7 +239,7 @@ /turf/open/floor/engine, /area/ruin/syndicate_lava_base/testlab) "aZ" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index d2bbe9c5188..bae9001b061 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -2816,7 +2816,7 @@ /area/ruin/space/has_grav/dangerous_research/dorms) "La" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/ruin/space/has_grav/dangerous_research/lab) "Lc" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 923ffc77cd3..8ea4ae95923 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -831,7 +831,7 @@ /area/ruin/space/ancientstation/delta/ai) "dD" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/roller, +/obj/item/emergency_bed, /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 470a3cde253..0048ccb3976 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -121,7 +121,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/onehalf/hallway) "aA" = ( -/obj/item/roller, +/obj/item/emergency_bed, /turf/open/floor/iron/white, /area/ruin/space/has_grav/onehalf/dorms_med) "aB" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 58d2b1b0804..2affccdafad 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -9302,7 +9302,7 @@ dir = 1 }, /obj/machinery/light/cold/directional/west, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/skyrat/interdynefob/medbay) "Ra" = ( @@ -10598,7 +10598,9 @@ }, /area/ruin/space/has_grav/skyrat/interdynefob/service/diner) "Wt" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/medical, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/skyrat/interdynefob/medbay) @@ -11224,7 +11226,9 @@ /area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral) "Zs" = ( /obj/item/bedsheet/medical, -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/skyrat/interdynefob/medbay) "Zt" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm index 3e18590cb99..30195414409 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm @@ -431,7 +431,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "lN" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, @@ -562,7 +562,9 @@ /turf/open/floor/carpet/lone, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "pQ" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/random, /obj/machinery/door/window{ dir = 8 @@ -785,7 +787,9 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "vG" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/random, /obj/machinery/door/window{ dir = 8 @@ -870,7 +874,9 @@ /area/ruin/space/has_grav/powered/skyrat/scrapheap) "yl" = ( /obj/machinery/light/red/directional/east, -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/random, /obj/machinery/door/window{ dir = 8 @@ -1005,7 +1011,7 @@ /turf/open/floor/iron/white/textured_large, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "Cg" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, @@ -1630,7 +1636,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "PJ" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/random, /obj/machinery/door/window{ dir = 8 @@ -1833,7 +1841,9 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "Vo" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/random, /obj/machinery/door/window{ dir = 8 diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm index a5dc9eaab2d..266e1aec018 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm @@ -2042,11 +2042,6 @@ }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532engineering) -"Rf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/airless, -/area/ruin/space/has_grav/shuttle8532crewquarters) "RA" = ( /obj/structure/railing/corner{ dir = 8 @@ -3508,7 +3503,7 @@ ff pu RE Ds -Rf +yv Ds Nr Ds diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm index 76181cecd81..602aa1a273b 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm @@ -492,7 +492,7 @@ /turf/open/misc/asteroid/airless, /area/ruin/space/has_grav/whiteship/box) "nz" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/white/airless, /area/ruin/space/has_grav/whiteship/box) @@ -515,7 +515,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/whiteship/box) "oe" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/siding/yellow{ dir = 6 }, diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm index bcd73158470..c6de835f18a 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm @@ -505,7 +505,7 @@ /turf/open/floor/iron/shuttle/cargo, /area/ruin/space/has_grav/whiteship/box) "nz" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/white/airless, /area/ruin/space/has_grav/whiteship/box) @@ -528,7 +528,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/whiteship/box) "oe" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/siding/yellow{ dir = 6 }, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 07f0283bb95..90eff043bb5 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -7289,7 +7289,7 @@ /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa/black_ops_bus) "hhL" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/white, /area/awaymission/black_mesa/hecu_zone_camp) @@ -7444,12 +7444,12 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/high_security_surgery) "hzh" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa/hecu_zone_infirmary) "hzj" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /obj/effect/mob_spawn/corpse/human/scientist_zombie, /turf/open/floor/iron/smooth_large, @@ -7852,7 +7852,7 @@ /area/awaymission/black_mesa/employee_dorm_room) "iqd" = ( /obj/machinery/light/cold/directional/west, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/deep_sci_medbay) @@ -7939,7 +7939,7 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/entrance_internal_hall) "ixj" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /obj/effect/mob_spawn/corpse/human/scientist_zombie, /turf/open/floor/iron/textured_half, @@ -8311,7 +8311,7 @@ /turf/open/floor/plating/cobblestone, /area/awaymission/black_mesa/hecu_zone_camp) "jfP" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/textured_half, /area/awaymission/black_mesa/hecu_zone_infirmary) @@ -13175,7 +13175,7 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen/acid_lake) "syy" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /obj/effect/mob_spawn/corpse/human/engineer, /turf/open/floor/iron/smooth_large, @@ -15697,7 +15697,7 @@ /turf/open/floor/iron/textured_half, /area/awaymission/black_mesa/hecu_zone_infirmary) "xnW" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/deep_sci_medbay) @@ -15753,7 +15753,7 @@ /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa/black_ops_bus) "xww" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /obj/effect/mob_spawn/corpse/human/scientist_zombie, /turf/open/floor/iron/textured_large, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index e464f86bc22..a643bde9e4c 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -8927,7 +8927,7 @@ /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) "EK" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 6603903e2da..3fe77380b17 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -1128,10 +1128,8 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 8 }, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/corner{ @@ -5367,7 +5365,7 @@ /area/station/maintenance/central/greater) "ceK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "ceZ" = ( @@ -6076,7 +6074,7 @@ /turf/open/floor/plating/rust, /area/station/maintenance/department/engine/atmos) "cvy" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "cvH" = ( @@ -8583,9 +8581,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "dry" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/item/bedsheet/medical, /obj/machinery/light/small/directional/east, @@ -17204,7 +17201,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -19697,7 +19694,7 @@ }, /area/station/engineering/atmos) "hjx" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -23490,7 +23487,9 @@ /turf/open/floor/iron, /area/station/security/brig/entrance) "iAZ" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet, /obj/effect/turf_decal/siding/red{ dir = 5 @@ -31257,10 +31256,8 @@ /area/station/cargo/sorting) "llP" = ( /obj/structure/cable, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 8 }, /obj/effect/turf_decal/trimline/blue/corner, /obj/machinery/power/apc/auto_name/directional/south, @@ -49089,9 +49086,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/recreation) "rsz" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/item/bedsheet/medical, /obj/machinery/light/small/directional/east, @@ -53446,13 +53442,13 @@ /area/station/maintenance/port/greater) "sMT" = ( /obj/structure/table, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 14 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 18 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 25 }, /obj/item/wheelchair{ @@ -58694,9 +58690,8 @@ /turf/open/floor/wood/tile, /area/station/service/bar) "uAH" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/item/bedsheet/medical, @@ -59569,7 +59564,7 @@ /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "uQf" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/extinguisher_cabinet/directional/west, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, @@ -61059,8 +61054,8 @@ /area/station/service/chapel/office) "vnq" = ( /obj/structure/cable, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet{ dir = 1 @@ -69991,7 +69986,7 @@ "xRl" = ( /obj/structure/cable, /obj/machinery/iv_drip, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/siding/red, /turf/open/floor/iron/white, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 6bff2305d60..d866962b8a4 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -6286,8 +6286,8 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "bBG" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -7909,7 +7909,9 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 4 }, -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet/medical, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -14308,7 +14310,7 @@ /turf/open/floor/iron/dark, /area/station/service/theater) "dxo" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -22258,7 +22260,7 @@ /area/station/security/checkpoint/supply) "fym" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -30010,7 +30012,7 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "huR" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -38890,7 +38892,9 @@ /turf/open/floor/iron, /area/station/cargo/office) "jFJ" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet/medical, /obj/structure/sign/nanotrasen{ pixel_x = 32 @@ -39873,10 +39877,10 @@ "jRJ" = ( /obj/machinery/defibrillator_mount/directional/south, /obj/item/radio/intercom/directional/west, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 6 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 11 }, /obj/structure/table/reinforced/rglass, @@ -47731,8 +47735,8 @@ /turf/open/floor/iron, /area/station/security/checkpoint/escape) "lQj" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical{ + dir = 8 }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, @@ -48382,7 +48386,7 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "mbA" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light/directional/south, @@ -58812,7 +58816,7 @@ /area/station/commons/locker) "oOz" = ( /obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/item/restraints/handcuffs, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -59373,7 +59377,7 @@ }, /area/station/service/chapel) "oVI" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -59428,7 +59432,7 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/medical) @@ -64516,7 +64520,7 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/storage) "qgp" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/item/bot_assembly/medbot, /turf/open/floor/plating, /area/station/medical/abandoned) @@ -68195,9 +68199,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "rff" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -70244,7 +70247,7 @@ /area/station/engineering/atmos/pumproom) "rFm" = ( /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/siding/dark_blue, /obj/effect/turf_decal/tile/dark_blue/half/contrasted, @@ -81533,7 +81536,7 @@ /turf/open/floor/iron/white, /area/station/science/lab) "uue" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, @@ -85138,7 +85141,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "vnB" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/camera/directional/east{ c_tag = "Medbay - Operating Room"; @@ -85556,7 +85559,7 @@ /turf/open/floor/iron, /area/station/science/research/abandoned) "vtt" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -93154,7 +93157,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "xqc" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/blindfold, @@ -93291,7 +93296,7 @@ "xsj" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2380e6cba6f..7d665faf506 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2594,8 +2594,8 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -9100,7 +9100,7 @@ "cLf" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -18390,7 +18390,7 @@ /area/station/engineering/storage_shared) "fKi" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/station/medical/medbay/central) @@ -18964,7 +18964,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "fUj" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white/textured, /area/station/security/medical) "fUn" = ( @@ -30112,8 +30112,8 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -32296,7 +32296,9 @@ /turf/open/floor/iron/dark/side, /area/station/service/chapel) "kmA" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet/medical, /obj/machinery/camera/directional/east{ c_tag = "Labor Camp Infirmary"; @@ -32502,7 +32504,9 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "kpX" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -35103,7 +35107,7 @@ /area/station/science/xenobiology) "lei" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lek" = ( @@ -38020,7 +38024,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) @@ -45793,7 +45797,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "ozV" = ( @@ -55544,7 +55548,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) @@ -57551,7 +57555,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) @@ -67859,7 +67863,7 @@ dir = 10 }, /obj/structure/sign/warning/chem_diamond/directional/west, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/white, @@ -68264,10 +68268,10 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_x = -1 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_x = 4 }, /obj/item/storage/medkit/regular{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2d212a19e06..438aa427124 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -18025,7 +18025,7 @@ /obj/item/paper/guides/jobs/medical/morgue{ pixel_y = 31 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, @@ -18163,8 +18163,8 @@ "gLY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/roller, -/obj/item/roller, +/obj/item/emergency_bed, +/obj/item/emergency_bed, /obj/item/toy/figure/md, /turf/open/floor/iron/white, /area/station/medical/abandoned) @@ -18651,7 +18651,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/security/medical) "gXd" = ( @@ -19177,13 +19177,9 @@ /area/station/security/brig) "hgu" = ( /obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" - }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/cold/directional/south, +/obj/structure/bed/medical, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "hgA" = ( @@ -23755,7 +23751,9 @@ /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) "iMd" = ( -/obj/structure/bed, +/obj/structure/bed/medical/emergency{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "iMi" = ( @@ -30385,7 +30383,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "kXD" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/item/radio/intercom/directional/south, /obj/machinery/camera/directional/south{ c_tag = "Medbay Foyer"; @@ -30833,8 +30831,8 @@ /turf/open/floor/iron, /area/station/construction/storage_wing) "lgj" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical{ + dir = 8 }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, @@ -31401,7 +31399,7 @@ /area/station/service/library) "lrR" = ( /obj/machinery/light/directional/south, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, @@ -31752,7 +31750,7 @@ "lyx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) @@ -34898,8 +34896,8 @@ /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) "mFu" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -37297,7 +37295,7 @@ /turf/open/floor/iron/dark, /area/station/security/office) "nvI" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) @@ -37543,8 +37541,8 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "nzQ" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -37849,7 +37847,9 @@ /turf/open/floor/carpet, /area/station/command/bridge) "nEF" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, @@ -39923,8 +39923,8 @@ /turf/open/floor/iron/dark/textured_large, /area/station/science/cytology) "ouj" = ( -/obj/structure/bed/roller, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -41568,7 +41568,9 @@ /turf/open/floor/engine/cult, /area/station/service/library) "oZs" = ( -/obj/structure/bed, +/obj/structure/bed/medical/emergency{ + dir = 4 + }, /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/green/fourcorners, @@ -43595,7 +43597,7 @@ /area/station/command/bridge) "pKa" = ( /obj/structure/cable, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -44469,7 +44471,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "qbr" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, @@ -48295,7 +48299,7 @@ "rtX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "rul" = ( @@ -52578,7 +52582,7 @@ /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) "sTQ" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, @@ -54291,11 +54295,11 @@ /area/station/medical/medbay/central) "tzI" = ( /obj/structure/table/reinforced, -/obj/item/roller, -/obj/item/roller{ +/obj/item/emergency_bed, +/obj/item/emergency_bed{ pixel_y = 3 }, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 6 }, /obj/structure/window/spawner/directional/west, @@ -56031,7 +56035,7 @@ c_tag = "Medbay Virology Wing"; network = list("ss13","medbay") }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "ucd" = ( @@ -56519,16 +56523,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"umA" = ( -/obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "umS" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/computer/records/security{ @@ -60140,7 +60134,7 @@ /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "vxB" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/camera/directional/west{ c_tag = "Gateway - Atrium" }, @@ -61542,7 +61536,9 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "vUC" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet, /obj/structure/disposalpipe/segment{ dir = 4 @@ -89901,7 +89897,7 @@ jpU vJe qXh ehg -umA +hgu vun mWC uTj diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 98136e8fcfb..349efe8c776 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -358,7 +358,7 @@ /turf/open/floor/plating, /area/mine/maintenance/production) "cy" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -3724,7 +3724,7 @@ /turf/open/floor/plating, /area/mine/hydroponics) "vu" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 1911289c036..66f241b8158 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -6410,7 +6410,7 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/entry) "bBg" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/cold/directional/south, @@ -8022,8 +8022,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/floor3/aft) "bYX" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -9274,8 +9274,8 @@ "coZ" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical{ + dir = 8 }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) @@ -21186,7 +21186,7 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/dark/textured, /area/station/medical/office) @@ -26967,7 +26967,7 @@ /turf/open/floor/plating, /area/station/maintenance/floor3/starboard) "hfd" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, @@ -30248,7 +30248,7 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "hXt" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -31258,7 +31258,9 @@ "ilI" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "ilK" = ( @@ -33162,8 +33164,8 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "iMF" = ( -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/item/bedsheet/medical{ dir = 4 @@ -36432,7 +36434,7 @@ /area/station/security/prison) "jEZ" = ( /obj/structure/window/spawner/directional/south, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness) "jFh" = ( @@ -54133,7 +54135,9 @@ /area/station/medical/psychology) "ocO" = ( /obj/effect/turf_decal/tile/green/opposingcorners, -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/item/bedsheet/green, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, @@ -57325,7 +57329,7 @@ /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "oVy" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/gym/mirrored/right{ pixel_y = 32 @@ -61450,8 +61454,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "qcI" = ( -/obj/structure/bed{ - dir = 1 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/sign/poster/official/random/directional/west, @@ -71306,7 +71310,7 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark/textured, @@ -79383,8 +79387,8 @@ /turf/open/floor/grass, /area/station/science/cytology) "uPc" = ( -/obj/structure/bed{ - dir = 1 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/sign/poster/official/random/directional/east, @@ -84895,8 +84899,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) "wlo" = ( -/obj/structure/bed{ - dir = 1 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/small/directional/south, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 1f8314543d2..765293aa131 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -5151,7 +5151,9 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 }, -/obj/structure/bed, +/obj/structure/bed/medical/emergency{ + dir = 4 + }, /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, @@ -5922,7 +5924,9 @@ /turf/open/floor/iron/smooth_edge, /area/station/cargo/storage) "bNs" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/machinery/iv_drip, /obj/item/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -6642,7 +6646,7 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "cad" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -7028,7 +7032,7 @@ /turf/open/floor/iron/dark, /area/station/security/execution/education) "cfH" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -12022,9 +12026,8 @@ /area/station/maintenance/port/fore) "dDR" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/machinery/newscaster/directional/east, /obj/machinery/duct, @@ -12971,7 +12974,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/port/fore) "dQr" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -14300,7 +14305,7 @@ /turf/open/floor/wood/parquet, /area/station/common/night_club) "ehl" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/bot, /obj/machinery/vending/wallmed/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -21037,10 +21042,8 @@ /area/station/hallway/secondary/exit/departure_lounge) "giB" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 8 }, /obj/machinery/newscaster/directional/west, /obj/machinery/duct, @@ -23482,7 +23485,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24161,7 +24164,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "haq" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/smooth_large, @@ -33923,7 +33926,7 @@ /area/station/commons/vacant_room/office) "jLi" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -51384,7 +51387,7 @@ }, /area/station/hallway/primary/aft) "oDz" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -51971,7 +51974,9 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/science/ordnance_maint) "oLN" = ( -/obj/structure/bed, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, /obj/machinery/iv_drip, /obj/item/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -56227,7 +56232,7 @@ /turf/closed/wall, /area/station/maintenance/aft/upper) "pUJ" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) @@ -74387,7 +74392,9 @@ /turf/open/floor/wood/large, /area/station/service/theater) "uPL" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -74905,7 +74912,9 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) "uXb" = ( -/obj/structure/bed, +/obj/structure/bed/medical{ + dir = 4 + }, /obj/item/clothing/glasses/blindfold, /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 5 diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 23dbba97fa2..704c4629463 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -487,7 +487,7 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "cl" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/effect/decal/cleanable/cobweb, @@ -5600,7 +5600,7 @@ /turf/open/floor/iron/white, /area/centcom/central_command_areas/control) "zI" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -7135,7 +7135,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) "HR" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/directional/west, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 70b2de9965b..1340882fcda 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -376,7 +376,7 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aiw" = ( -/obj/structure/bed, +/obj/structure/bed/pod, /obj/machinery/light/directional/east, /turf/open/indestructible/cobble/side{ dir = 4 @@ -2288,7 +2288,7 @@ }, /area/centcom/holding/cafe) "aEa" = ( -/obj/structure/bed, +/obj/structure/bed/pod, /turf/open/indestructible/cobble/corner, /area/centcom/holding/cafepark) "aEf" = ( @@ -4201,7 +4201,7 @@ /turf/open/floor/iron/dark, /area/centcom/interlink) "aYA" = ( -/obj/structure/bed, +/obj/structure/bed/pod, /turf/open/indestructible/cobble/side{ dir = 4 }, @@ -4390,7 +4390,7 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/centcom/holding/cafe) @@ -7711,7 +7711,7 @@ /turf/open/floor/wood, /area/centcom/holding/cafedorms) "jKj" = ( -/obj/structure/bed, +/obj/structure/bed/pod, /turf/open/floor/iron, /area/centcom/interlink) "jNs" = ( @@ -10877,7 +10877,7 @@ }, /area/cruiser_dock) "rMy" = ( -/obj/structure/bed{ +/obj/structure/bed/pod{ dir = 4 }, /turf/open/floor/iron, @@ -12953,7 +12953,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/centcom/holding/cafe) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index abf0c7e607e..aea13abc6e3 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2578,7 +2578,7 @@ /turf/open/floor/wood/large, /area/station/service/theater) "aka" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -12096,8 +12096,8 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -21911,10 +21911,8 @@ /turf/open/floor/iron/dark/herringbone, /area/station/commons/vacant_room) "gNE" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 8; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/machinery/defibrillator_mount/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -23579,7 +23577,7 @@ /area/station/maintenance/tram/left) "hvt" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ dir = 9 @@ -27717,9 +27715,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "iZY" = ( -/obj/structure/bed{ - dir = 4 - }, +/obj/structure/bed/medical/anchored, /obj/machinery/light/red/directional/west, /turf/open/floor/iron/textured_large, /area/station/security/execution/education) @@ -28863,10 +28859,8 @@ /turf/closed/wall, /area/station/medical/treatment_center) "jts" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 8 }, /obj/machinery/defibrillator_mount/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -30447,7 +30441,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "jWn" = ( -/obj/structure/bed, +/obj/structure/bed/medical/emergency{ + dir = 4 + }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, @@ -37951,7 +37947,7 @@ /area/station/commons/fitness/recreation/entertainment) "myA" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ dir = 5 @@ -42878,7 +42874,7 @@ /area/station/service/library) "ols" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/camera/directional/south{ c_tag = "Medical - Lobby"; network = list("ss13","medbay") @@ -45795,8 +45791,8 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/structure/bed{ - dir = 4 +/obj/structure/bed/medical/anchored{ + dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -59937,7 +59933,7 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "urO" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -60926,7 +60922,7 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "uGL" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -63196,7 +63192,7 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "vuO" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/security/execution/education) "vuT" = ( @@ -69509,7 +69505,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) "xRJ" = ( -/obj/structure/bed, +/obj/structure/bed/medical/emergency{ + dir = 4 + }, /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/white, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 997d1d1330e..9bfcf599bb2 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -106,7 +106,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aN" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aR" = ( diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index 608832bf5b3..d861d6af348 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -440,7 +440,7 @@ /area/shuttle/escape/brig) "tH" = ( /obj/item/trash/pistachios, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_x = -5 }, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 14a6c123b85..f2102147313 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -309,7 +309,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "aL" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, @@ -319,7 +319,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "aN" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/light/small/directional/east, diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm index ee24973d323..81eaec94c61 100644 --- a/_maps/shuttles/emergency_lance.dmm +++ b/_maps/shuttles/emergency_lance.dmm @@ -370,7 +370,7 @@ /area/shuttle/escape) "kx" = ( /obj/machinery/iv_drip, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/side{ @@ -387,7 +387,7 @@ }, /area/shuttle/escape/brig) "kN" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/mapping_helpers/broken_floor, @@ -1250,7 +1250,7 @@ "MC" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/iv_drip, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron/dark/side{ dir = 1 @@ -1577,7 +1577,7 @@ /turf/open/floor/iron/dark/textured, /area/shuttle/escape) "Xz" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/dark/textured, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 04779fedacb..7689bed7306 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -519,14 +519,13 @@ /turf/template_noop, /area/shuttle/escape) "un" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/escape) "uG" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" +/obj/structure/bed/medical{ + dir = 4 }, /obj/structure/curtain, /turf/open/floor/mineral/titanium/tiled/blue, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 4345319c2e3..4b12d66baed 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -511,7 +511,7 @@ /area/shuttle/escape) "by" = ( /obj/machinery/iv_drip, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/iron/white/side{ dir = 10 }, diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency_venture.dmm index e57cd3a6eee..6b72f22dc29 100644 --- a/_maps/shuttles/emergency_venture.dmm +++ b/_maps/shuttles/emergency_venture.dmm @@ -360,7 +360,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "tE" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 68b28c95777..ca3da37f63b 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -266,7 +266,7 @@ /area/shuttle/syndicate/medical) "bs" = ( /obj/machinery/light/directional/north, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index 23e28743c0d..38067cecaae 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -796,7 +796,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 5 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) @@ -1017,7 +1017,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index e4caf73a4ee..72c843587f7 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -1212,7 +1212,7 @@ /area/shuttle/abandoned/medbay) "cF" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/blood/old, @@ -1247,7 +1247,7 @@ "cH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white/side{ dir = 1 @@ -1555,7 +1555,7 @@ "dk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white/side{ dir = 10 @@ -1624,7 +1624,7 @@ "dr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /turf/open/floor/iron/white/side{ dir = 6 diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 74b643e2ebc..36df707a668 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -1804,7 +1804,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/white/corners, /obj/structure/closet/crate/medical, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_y = 4 }, /obj/item/healthanalyzer, diff --git a/_maps/shuttles/whiteship_obelisk.dmm b/_maps/shuttles/whiteship_obelisk.dmm index edf3e2a1adb..ec9697103d9 100644 --- a/_maps/shuttles/whiteship_obelisk.dmm +++ b/_maps/shuttles/whiteship_obelisk.dmm @@ -704,7 +704,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/abandoned/medbay) "Ow" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /turf/open/floor/mineral/titanium/white, /area/shuttle/abandoned/medbay) "Ph" = ( diff --git a/_maps/templates/holodeck_medicalsim.dmm b/_maps/templates/holodeck_medicalsim.dmm index 98f5a92da7f..acc38d02c58 100644 --- a/_maps/templates/holodeck_medicalsim.dmm +++ b/_maps/templates/holodeck_medicalsim.dmm @@ -244,7 +244,7 @@ /area/template_noop) "wV" = ( /obj/structure/window/spawner/directional/north, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm index 39adfda04a9..a364024c345 100644 --- a/_maps/templates/lazy_templates/ninja_den.dmm +++ b/_maps/templates/lazy_templates/ninja_den.dmm @@ -1611,7 +1611,7 @@ /obj/structure/closet, /obj/item/surgery_tray, /obj/machinery/iv_drip, -/obj/item/roller, +/obj/item/emergency_bed, /obj/item/storage/medkit/regular, /obj/item/reagent_containers/medigel/synthflesh, /obj/item/reagent_containers/medigel/synthflesh, diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index d2178d6adfe..d16c466f9dc 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -171,7 +171,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/pen/fountain = 1, /obj/item/restraints/handcuffs/cable = 1, /obj/item/restraints/legcuffs/bola = 1, - /obj/item/roller = 1, + /obj/item/emergency_bed = 1, /obj/item/spear = 1, /obj/item/weldingtool/largetank = 1, /obj/item/market_uplink/blackmarket = 1, diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 2f8cb369f95..3d37d2e52b4 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -197,10 +197,10 @@ //Handle any extras after buckling //Called on buckle_mob() -/atom/movable/proc/post_buckle_mob(mob/living/M) +/atom/movable/proc/post_buckle_mob(mob/living/buckled_mob) //same but for unbuckle -/atom/movable/proc/post_unbuckle_mob(mob/living/M) +/atom/movable/proc/post_unbuckle_mob(mob/living/unbuckled_mob) /** * Simple helper proc that runs a suite of checks to test whether it is possible or not to buckle the target mob to src. diff --git a/code/game/objects/effects/spawners/random/medical.dm b/code/game/objects/effects/spawners/random/medical.dm index 34541083775..ccbc109254a 100644 --- a/code/game/objects/effects/spawners/random/medical.dm +++ b/code/game/objects/effects/spawners/random/medical.dm @@ -132,7 +132,7 @@ name = "patient stretcher spawner" icon_state = "rollerbed" loot = list( - /obj/structure/bed/roller, + /obj/structure/bed/medical/emergency, /obj/vehicle/ridden/wheelchair, ) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 63133a06be1..c9c4815e3da 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -704,7 +704,7 @@ new /obj/item/blood_filter(src) new /obj/item/stack/medical/bone_gel(src) new /obj/item/stack/sticky_tape/surgical(src) - new /obj/item/roller(src) + new /obj/item/emergency_bed(src) new /obj/item/clothing/suit/jacket/straight_jacket(src) new /obj/item/clothing/mask/muzzle(src) new /obj/item/mmi/syndie(src) diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 59346a79453..87d8ffb1710 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -11,9 +11,8 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_ALIEN_NEST canSmoothWith = SMOOTH_GROUP_ALIEN_NEST - buildstacktype = null + build_stack_type = null flags_1 = NODECONSTRUCT_1 - bolts = FALSE var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER) /obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 9ba3203c75b..edcec5add3a 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -1,12 +1,12 @@ /* Beds... get your mind out of the gutter, they're for sleeping! * Contains: * Beds + * Medical beds * Roller beds + * Pet beds */ -/* - * Beds - */ +/// Beds /obj/structure/bed name = "bed" desc = "This is used to lie in, sleep in or strap on." @@ -18,65 +18,142 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 0.35 - var/buildstacktype = /obj/item/stack/sheet/iron - var/buildstackamount = 2 - var/bolts = TRUE + /// What material this bed is made of + var/build_stack_type = /obj/item/stack/sheet/iron + /// How many mats to drop when deconstructed + var/build_stack_amount = 2 /obj/structure/bed/Initialize(mapload) . = ..() AddElement(/datum/element/soft_landing) + register_context() /obj/structure/bed/examine(mob/user) . = ..() - if(bolts) + if(!(flags_1 & NODECONSTRUCT_1)) . += span_notice("It's held together by a couple of bolts.") +/obj/structure/bed/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + if(held_item) + if(held_item.tool_behaviour != TOOL_WRENCH || flags_1 & NODECONSTRUCT_1) + return + + context[SCREENTIP_CONTEXT_RMB] = "Dismantle" + return CONTEXTUAL_SCREENTIP_SET + + else if(has_buckled_mobs()) + context[SCREENTIP_CONTEXT_LMB] = "Unbuckle" + return CONTEXTUAL_SCREENTIP_SET + /obj/structure/bed/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(buildstacktype) - new buildstacktype(loc,buildstackamount) + if(build_stack_type) + new build_stack_type(loc, build_stack_amount) ..() /obj/structure/bed/attack_paw(mob/user, list/modifiers) return attack_hand(user, modifiers) /obj/structure/bed/wrench_act_secondary(mob/living/user, obj/item/weapon) - if(flags_1&NODECONSTRUCT_1) + if(flags_1 & NODECONSTRUCT_1) return TRUE + ..() weapon.play_tool_sound(src) deconstruct(disassembled = TRUE) return TRUE -/* - * Roller beds - */ -/obj/structure/bed/roller - name = "roller bed" - icon = 'icons/obj/medical/rollerbed.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE - icon_state = "down" +/// Medical beds +/obj/structure/bed/medical + name = "medical bed" + icon = 'icons/obj/medical/medical_bed.dmi' + desc = "A medical bed with wheels for assisted patient movement or medbay racing tournaments." + icon_state = "med_down" + base_icon_state = "med" anchored = FALSE resistance_flags = NONE - ///The item it spawns when it's folded up. - var/foldabletype = /obj/item/roller + build_stack_type = /obj/item/stack/sheet/mineral/titanium + build_stack_amount = 1 + /// The item it spawns when it's folded up. + var/foldable_type -/obj/structure/bed/roller/Initialize(mapload) +/obj/structure/bed/medical/anchored + anchored = TRUE + +/obj/structure/bed/medical/emergency + name = "emergency medical bed" + desc = "A compact medical bed. This emergency version can be folded and carried for quick transport." + icon_state = "emerg_down" + base_icon_state = "emerg" + foldable_type = /obj/item/emergency_bed + +/obj/structure/bed/medical/Initialize(mapload) . = ..() - AddElement( \ - /datum/element/contextual_screentip_bare_hands, \ - rmb_text = "Fold up", \ - ) AddElement(/datum/element/noisy_movement) -/obj/structure/bed/roller/examine(mob/user) +/obj/structure/bed/medical/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) . = ..() - . += span_notice("You can fold it up with a Right-click.") + context[SCREENTIP_CONTEXT_ALT_LMB] = "[anchored ? "Release brakes" : "Apply brakes"]" + if(!isnull(foldable_type) && !has_buckled_mobs()) + context[SCREENTIP_CONTEXT_RMB] = "Fold up" -/obj/structure/bed/roller/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/roller/robo)) - var/obj/item/roller/robo/R = W - if(R.loaded) - to_chat(user, span_warning("You already have a roller bed docked!")) + return CONTEXTUAL_SCREENTIP_SET + +/obj/structure/bed/medical/examine(mob/user) + . = ..() + if(anchored) + . += span_notice("The brakes are applied. They can be released with an Alt-click.") + else + . += span_notice("The brakes can be applied with an Alt-click.") + + if(!isnull(foldable_type)) + . += span_notice("You can fold it up with a Right-click.") + +/obj/structure/bed/medical/AltClick(mob/user) + . = ..() + anchored = !anchored + balloon_alert(user, "brakes [anchored ? "applied" : "released"]") + update_appearance() + +/obj/structure/bed/medical/post_buckle_mob(mob/living/patient) + set_density(TRUE) + update_appearance() + +/obj/structure/bed/medical/post_unbuckle_mob(mob/living/patient) + set_density(FALSE) + update_appearance() + +/obj/structure/bed/medical/update_icon_state() + . = ..() + if(has_buckled_mobs()) + icon_state = "[base_icon_state]_up" + // Push them up from the normal lying position + if(buckled_mobs.len > 1) + for(var/mob/living/patient as anything in buckled_mobs) + patient.pixel_y = patient.base_pixel_y + else + buckled_mobs[1].pixel_y = buckled_mobs[1].base_pixel_y + + else + icon_state = "[base_icon_state]_down" + +/obj/structure/bed/medical/update_overlays() + . = ..() + if(!anchored) + return + + if(has_buckled_mobs()) + . += mutable_appearance(icon, "brakes_up") + . += emissive_appearance(icon, "brakes_up", src, alpha = src.alpha) + else + . += mutable_appearance(icon, "brakes_down") + . += emissive_appearance(icon, "brakes_down", src, alpha = src.alpha) + +/obj/structure/bed/medical/emergency/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/emergency_bed/silicon)) + var/obj/item/emergency_bed/silicon/silicon_bed = item + if(silicon_bed.loaded) + to_chat(user, span_warning("You already have a medical bed docked!")) return if(has_buckled_mobs()) @@ -86,14 +163,14 @@ else user_unbuckle_mob(buckled_mobs[1],user) else - R.loaded = src - forceMove(R) + silicon_bed.loaded = src + forceMove(silicon_bed) user.visible_message(span_notice("[user] collects [src]."), span_notice("You collect [src].")) - return 1 + return TRUE else return ..() -/obj/structure/bed/roller/attack_hand_secondary(mob/user, list/modifiers) +/obj/structure/bed/medical/emergency/attack_hand_secondary(mob/user, list/modifiers) . = ..() if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN @@ -101,77 +178,68 @@ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN if(has_buckled_mobs()) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + user.visible_message(span_notice("[user] collapses [src]."), span_notice("You collapse [src].")) - var/obj/structure/bed/roller/folding_bed = new foldabletype(get_turf(src)) + var/obj/structure/bed/medical/emergency/folding_bed = new foldable_type(get_turf(src)) user.put_in_hands(folding_bed) qdel(src) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/structure/bed/roller/post_buckle_mob(mob/living/M) - set_density(TRUE) - icon_state = "up" - //Push them up from the normal lying position - M.pixel_y = M.base_pixel_y - -/obj/structure/bed/roller/post_unbuckle_mob(mob/living/M) - set_density(FALSE) - icon_state = "down" - //Set them back down to the normal lying position - M.pixel_y = M.base_pixel_y + M.body_position_pixel_y_offset - - -/obj/item/roller +/obj/item/emergency_bed name = "roller bed" - desc = "A collapsed roller bed that can be carried around." - icon = 'icons/obj/medical/rollerbed.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE - icon_state = "folded" - inhand_icon_state = "rollerbed" + desc = "A collapsed medical bed that can be carried around." + icon = 'icons/obj/medical/medical_bed.dmi' + icon_state = "emerg_folded" + inhand_icon_state = "emergencybed" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL // No more excuses, stop getting blood everywhere -/obj/item/roller/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/roller/robo)) - var/obj/item/roller/robo/R = I - if(R.loaded) - to_chat(user, span_warning("[R] already has a roller bed loaded!")) +/obj/item/emergency_bed/attackby(obj/item/item, mob/living/user, params) + if(istype(item, /obj/item/emergency_bed/silicon)) + var/obj/item/emergency_bed/silicon/silicon_bed = item + if(silicon_bed.loaded) + to_chat(user, span_warning("[silicon_bed] already has a roller bed loaded!")) return - user.visible_message(span_notice("[user] loads [src]."), span_notice("You load [src] into [R].")) - R.loaded = new/obj/structure/bed/roller(R) + + user.visible_message(span_notice("[user] loads [src]."), span_notice("You load [src] into [silicon_bed].")) + silicon_bed.loaded = new/obj/structure/bed/medical/emergency(silicon_bed) qdel(src) //"Load" return + else return ..() -/obj/item/roller/attack_self(mob/user) - deploy_roller(user, user.loc) +/obj/item/emergency_bed/attack_self(mob/user) + deploy_bed(user, user.loc) -/obj/item/roller/afterattack(obj/target, mob/user , proximity) +/obj/item/emergency_bed/afterattack(obj/target, mob/user, proximity) . = ..() if(!proximity) return - if(isopenturf(target)) - deploy_roller(user, target) -/obj/item/roller/proc/deploy_roller(mob/user, atom/location) - var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(location) - R.add_fingerprint(user) + if(isopenturf(target)) + deploy_bed(user, target) + +/obj/item/emergency_bed/proc/deploy_bed(mob/user, atom/location) + var/obj/structure/bed/medical/emergency/deployed = new /obj/structure/bed/medical/emergency(location) + deployed.add_fingerprint(user) qdel(src) -/obj/item/roller/robo //ROLLER ROBO DA! - name = "roller bed dock" - desc = "A collapsed roller bed that can be ejected for emergency use. Must be collected or replaced after use." - var/obj/structure/bed/roller/loaded = null +/obj/item/emergency_bed/silicon // ROLLER ROBO DA! + name = "emergency bed dock" + desc = "A collapsed medical bed that can be ejected for emergency use. Must be collected or replaced after use." + var/obj/structure/bed/medical/emergency/loaded = null -/obj/item/roller/robo/Initialize(mapload) +/obj/item/emergency_bed/silicon/Initialize(mapload) . = ..() loaded = new(src) -/obj/item/roller/robo/examine(mob/user) +/obj/item/emergency_bed/silicon/examine(mob/user) . = ..() . += "The dock is [loaded ? "loaded" : "empty"]." -/obj/item/roller/robo/deploy_roller(mob/user, atom/location) +/obj/item/emergency_bed/silicon/deploy_bed(mob/user, atom/location) if(loaded) loaded.forceMove(location) user.visible_message(span_notice("[user] deploys [loaded]."), span_notice("You deploy [loaded].")) @@ -179,15 +247,14 @@ else to_chat(user, span_warning("The dock is empty!")) -//Dog bed - +/// Dog bed /obj/structure/bed/dogbed name = "dog bed" icon_state = "dogbed" desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." anchored = FALSE - buildstacktype = /obj/item/stack/sheet/mineral/wood - buildstackamount = 10 + build_stack_type = /obj/item/stack/sheet/mineral/wood + build_stack_amount = 10 var/owned = FALSE /obj/structure/bed/dogbed/ian @@ -220,17 +287,18 @@ anchored = TRUE ///Used to set the owner of a dogbed, returns FALSE if called on an owned bed or an invalid one, TRUE if the possesion succeeds -/obj/structure/bed/dogbed/proc/update_owner(mob/living/M) +/obj/structure/bed/dogbed/proc/update_owner(mob/living/furball) if(owned || type != /obj/structure/bed/dogbed) //Only marked beds work, this is hacky but I'm a hacky man return FALSE //Failed - owned = TRUE - name = "[M]'s bed" - desc = "[M]'s bed! Looks comfy." - return TRUE //Let any callers know that this bed is ours now -/obj/structure/bed/dogbed/buckle_mob(mob/living/M, force, check_loc) + owned = TRUE + name = "[furball]'s bed" + desc = "[furball]'s bed! Looks comfy." + return TRUE // Let any callers know that this bed is ours now + +/obj/structure/bed/dogbed/buckle_mob(mob/living/furball, force, check_loc) . = ..() - update_owner(M) + update_owner(furball) /obj/structure/bed/maint name = "dirty mattress" @@ -241,18 +309,18 @@ . = ..() AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOLD, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 25) -//Double Beds, for luxurious sleeping, i.e. the captain and maybe heads- if people use this for ERP, send them to skyrat +// Double Beds, for luxurious sleeping, i.e. the captain and maybe heads- if people use this for ERP, send them to skyrat /obj/structure/bed/double name = "double bed" desc = "A luxurious double bed, for those too important for small dreams." icon_state = "bed_double" - buildstackamount = 4 + build_stack_amount = 4 max_buckled_mobs = 2 - ///The mob who buckled to this bed second, to avoid other mobs getting pixel-shifted before he unbuckles. + /// The mob who buckled to this bed second, to avoid other mobs getting pixel-shifted before he unbuckles. var/mob/living/goldilocks /obj/structure/bed/double/post_buckle_mob(mob/living/target) - if(buckled_mobs.len > 1 && !goldilocks) //Push the second buckled mob a bit higher from the normal lying position + if(buckled_mobs.len > 1 && !goldilocks) // Push the second buckled mob a bit higher from the normal lying position target.pixel_y = target.base_pixel_y + 6 goldilocks = target diff --git a/code/modules/antagonists/abductor/abductor_structures.dm b/code/modules/antagonists/abductor/abductor_structures.dm index 8acb5e452f1..7da1d72d06b 100644 --- a/code/modules/antagonists/abductor/abductor_structures.dm +++ b/code/modules/antagonists/abductor/abductor_structures.dm @@ -5,7 +5,7 @@ name = "resting contraption" desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?" icon = 'icons/obj/antags/abductor.dmi' - buildstacktype = /obj/item/stack/sheet/mineral/abductor + build_stack_type = /obj/item/stack/sheet/mineral/abductor icon_state = "bed" /obj/structure/table_frame/abductor diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 04ff558605e..430c32a35ab 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -129,7 +129,7 @@ contains = list( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/item/reagent_containers/medigel/sterilizine, - /obj/item/roller, + /obj/item/emergency_bed, ) crate_name = "surgical supplies crate" diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 53e9b22bf1d..3dac90b4baf 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -48,7 +48,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/paramedic suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list( - /obj/item/roller = 1, + /obj/item/emergency_bed = 1, ) belt = /obj/item/storage/belt/medical/paramedic ears = /obj/item/radio/headset/headset_med diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 3b2adb007f8..35c54567001 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -682,7 +682,7 @@ /obj/item/circular_saw, /obj/item/bonesetter, /obj/item/extinguisher/mini, - /obj/item/roller/robo, + /obj/item/emergency_bed/silicon, /obj/item/borg/cyborghug/medical, /obj/item/stack/medical/gauze, /obj/item/stack/medical/bone_gel, @@ -900,7 +900,7 @@ /obj/item/melee/energy/sword/cyborg/saw, /obj/item/bonesetter, /obj/item/blood_filter, - /obj/item/roller/robo, + /obj/item/emergency_bed/silicon, /obj/item/crowbar/cyborg, /obj/item/extinguisher/mini, /obj/item/pinpointer/syndicate_cyborg, diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 8bf7723e4bb..33d866a659b 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -335,6 +335,30 @@ ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL +/datum/design/medical_bed + name = "Medical Bed" + desc = "A bed made of sterile materials ideal for use in the medical field. Patient assistance or joyriding, it'll do it all!" + id = "medicalbed" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2.7, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 1.7) + build_path = /obj/structure/bed/medical + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + ) + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + +/datum/design/emergency_bed + name = "Medical Bed (Emergency)" + desc = "A portable, foldable version of the medical bed. Perfect for paramedics or whenever you have mass casualties!" + id = "medicalbed_emergency" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2.7, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 1.7, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 5) + build_path = /obj/item/emergency_bed + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + ) + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + ///////////////////////////////////////// //////////Cybernetic Implants//////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 960696969d4..393cdc4b9d2 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -279,6 +279,7 @@ "dropper", "hemostat", "large_beaker", + "medicalbed", "mmi_m", "operating", "petri_dish", @@ -731,6 +732,7 @@ design_ids = list( "bluespace_matter_bin", "bluespacebodybag", + "medicalbed_emergency", "femto_servo", "quantum_keycard", "swapper", diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 782f2cc0c35..7ce3674c86a 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index f5f93dda3ce..6ceb5efe4d8 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/obj/medical/medical_bed.dmi b/icons/obj/medical/medical_bed.dmi new file mode 100644 index 00000000000..2d8e4b576ed Binary files /dev/null and b/icons/obj/medical/medical_bed.dmi differ diff --git a/icons/obj/medical/rollerbed.dmi b/icons/obj/medical/rollerbed.dmi deleted file mode 100644 index fcc4e833c34..00000000000 Binary files a/icons/obj/medical/rollerbed.dmi and /dev/null differ diff --git a/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm b/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm deleted file mode 100644 index b13a0657138..00000000000 --- a/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/structure/bed/roller - icon = 'modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi' - -/obj/item/roller - icon = 'modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi' diff --git a/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi b/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi deleted file mode 100644 index 08d9996cad8..00000000000 Binary files a/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi and /dev/null differ diff --git a/modular_skyrat/modules/altborgs/code/robot_model.dm b/modular_skyrat/modules/altborgs/code/robot_model.dm index 3c82f0105f6..ff423764573 100644 --- a/modular_skyrat/modules/altborgs/code/robot_model.dm +++ b/modular_skyrat/modules/altborgs/code/robot_model.dm @@ -426,7 +426,7 @@ /obj/item/retractor/advanced, /obj/item/cautery/advanced, /obj/item/scalpel/advanced, - /obj/item/roller/robo, + /obj/item/emergency_bed/silicon, /obj/item/card/emag, /obj/item/crowbar/cyborg, /obj/item/extinguisher/mini, diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 3000e0b7b90..e846c2ec685 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -455,11 +455,11 @@ if(!istype(target, /mob/living/carbon/human)) //Only checks if they are human, it would make sense for this to work on the dead. return FALSE - for(var/obj/structure/bed/roller/medigun in target.loc) //Prevents multiple beds from being spawned on the same turf + for(var/obj/structure/bed/medical/medigun in target.loc) //Prevents multiple beds from being spawned on the same turf return FALSE if(HAS_TRAIT(target, TRAIT_FLOORED) || target.resting) //Is the person already on the floor to begin with? Mostly a measure to prevent spamming. - var /obj/structure/bed/roller/medigun/created_bed = new /obj/structure/bed/roller/medigun(target.loc) + var /obj/structure/bed/medical/medigun/created_bed = new /obj/structure/bed/medical/medigun(target.loc) if(!target.stat == CONSCIOUS) created_bed.buckle_mob(target) @@ -537,31 +537,34 @@ if(heals_left <= 0) qdel(src) -//Hardlight Roller Bed. -/obj/structure/bed/roller/medigun - name = "hardlight roller bed" - desc = "A Roller Bed made out of Hardlight" +//Hardlight Emergency Bed. +/obj/structure/bed/medical/medigun + name = "hardlight medical bed" + desc = "A medical bed made out of Hardlight" icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi' + icon_state = "hardlight_down" + base_icon_state = "hardlight" max_integrity = 1 - buildstacktype = FALSE //It would not be good if people could use this to farm materials. - var/deploytime = 20 SECONDS //How long the roller beds lasts for without someone buckled to it. + flags_1 = NODECONSTRUCT_1 //Made from nothing, can't deconstruct + build_stack_type = null //It would not be good if people could use this to farm materials. + var/deploy_time = 20 SECONDS //How long the roller beds lasts for without someone buckled to it. -/obj/structure/bed/roller/medigun/Initialize(mapload) +/obj/structure/bed/medical/medigun/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, PROC_REF(check_bed)), deploytime) + addtimer(CALLBACK(src, PROC_REF(check_bed)), deploy_time) -/obj/structure/bed/roller/medigun/proc/check_bed() //Checks to see if anyone is buckled to the bed, if not the bed will qdel itself. +/obj/structure/bed/medical/medigun/proc/check_bed() //Checks to see if anyone is buckled to the bed, if not the bed will qdel itself. if(!has_buckled_mobs()) qdel(src) //Deletes the roller bed, mostly meant to prevent stockpiling and clutter return TRUE //There is nothing on the bed. else return FALSE //There is something on the bed. -/obj/structure/bed/roller/medigun/post_unbuckle_mob(mob/living/M) +/obj/structure/bed/medical/medigun/post_unbuckle_mob(mob/living/M) . = ..() qdel(src) -/obj/structure/bed/roller/medigun/MouseDrop(over_object, src_location, over_location) +/obj/structure/bed/medical/medigun/MouseDrop(over_object, src_location, over_location) if(over_object == usr && Adjacent(usr)) if(!ishuman(usr) || !usr.can_perform_action(src)) return FALSE diff --git a/modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi b/modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi index 5c44675c447..d5cebb12ba9 100644 Binary files a/modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi and b/modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi differ diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index f802d448382..840a974b2ea 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -407,7 +407,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( belt = /obj/item/storage/belt/medical/paramedic suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/storage/box/survival = 1, - /obj/item/roller = 1, + /obj/item/emergency_bed = 1, /obj/item/storage/medkit/surgery = 1, /obj/item/solfed_reporter/swat_caller = 1, /obj/item/beamout_tool = 1) diff --git a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm index 604d28eb5c1..23b65976985 100644 --- a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm +++ b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm @@ -29,7 +29,7 @@ /obj/item/reagent_containers/hypospray/combat,\ /obj/item/gun/medbeam,\ /obj/item/storage/medkit/tactical/ntrauma,\ - /obj/item/roller,\ + /obj/item/emergency_bed,\ ) /* diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index 284d6161d58..0ac4d57fafb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -172,7 +172,7 @@ var/color_changed = FALSE var/form_changed = FALSE - buildstacktype = /obj/item/stack/sheet/cloth + build_stack_type = /obj/item/stack/sheet/cloth /obj/structure/bed/pillow_tiny/Initialize(mapload) .=..() @@ -398,7 +398,7 @@ var/pillow2_form_changed = FALSE var/pillow3_form_changed = FALSE - buildstacktype = /obj/item/stack/sheet/cloth + build_stack_type = /obj/item/stack/sheet/cloth /obj/structure/bed/pillow_large/Initialize(mapload) update_icon() diff --git a/tgstation.dme b/tgstation.dme index 095ad1fe1b4..230d80ef563 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6037,7 +6037,6 @@ #include "modular_skyrat\modules\aesthetics\plasticflaps\code\plasticflaps.dm" #include "modular_skyrat\modules\aesthetics\posters\posters.dm" #include "modular_skyrat\modules\aesthetics\rack\code\rack.dm" -#include "modular_skyrat\modules\aesthetics\rollerbed\code\rollerbed.dm" #include "modular_skyrat\modules\aesthetics\shieldgen\code\shieldgen.dm" #include "modular_skyrat\modules\aesthetics\stationobjs\stationobjs.dm" #include "modular_skyrat\modules\aesthetics\status_display\code\status_display.dm" diff --git a/tools/UpdatePaths/Scripts/78078_medical_beds.txt b/tools/UpdatePaths/Scripts/78078_medical_beds.txt new file mode 100644 index 00000000000..bc9dc6a0d2d --- /dev/null +++ b/tools/UpdatePaths/Scripts/78078_medical_beds.txt @@ -0,0 +1,4 @@ +#Repathing for new medical beds + +/obj/structure/bed/roller : /obj/structure/bed/medical/emergency{@OLD} +/obj/item/roller : /obj/item/emergency_bed{@OLD} \ No newline at end of file