From 7cccae2fd5090b5f80413ac91a916e2184b27468 Mon Sep 17 00:00:00 2001 From: Ghosti <83688318+Gw0sty@users.noreply.github.com> Date: Sun, 2 Feb 2025 15:34:56 -0600 Subject: [PATCH] Dr scrubs and poppy (#5236) * Poppy and scrubs * forgot whoops --- _maps/map_files/Blueshift/Blueshift.dmm | 19 ++++++------------- _maps/map_files/BoxStation/BoxStation.dmm | 1 + .../map_files/Deltastation/DeltaStation2.dmm | 6 ++++++ .../map_files/IceBoxStation/IceBoxStation.dmm | 6 ++++++ _maps/map_files/tramstation/tramstation.dmm | 6 +++++- .../RandomEngines/BoxStation/supermatter.dmm | 11 ++++++++++- .../RandomEngines/MetaStation/supermatter.dmm | 13 ++++++++++++- .../RandomEngines/TramStation/supermatter.dmm | 5 +++++ 8 files changed, 51 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index f4929ba3613a..1497beddc1b5 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -61529,6 +61529,11 @@ /area/station/engineering/atmos) "lTH" = ( /obj/effect/turf_decal/bot, +/mob/living/basic/pet/poppy, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "lTN" = ( @@ -107587,18 +107592,6 @@ /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"uOa" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Space Access Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "AIsatAirlock" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/ai_monitored/aisat/exterior) "uOh" = ( /obj/structure/cable, /turf/open/floor/iron/dark/side, @@ -220911,7 +220904,7 @@ gLc gLc gLc tQB -uOa +nEX mcW kKI xya diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9dbd1633a978..5a1300bf4906 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1650,6 +1650,7 @@ /obj/structure/cable, /obj/machinery/holopad, /obj/machinery/duct, +/mob/living/basic/bot/cleanbot/medbay, /turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) "aBj" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index b231ec1a3dd2..b472196814c8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -17763,6 +17763,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/turf_decal/tile/blue/fourcorners, +/mob/living/basic/bot/cleanbot/medbay, /turf/open/floor/iron, /area/station/medical/storage) "eiK" = ( @@ -34948,6 +34949,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, +/mob/living/basic/pet/poppy, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ikx" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 9553433c5639..88eb84cb29eb 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -44232,6 +44232,11 @@ /area/station/security/prison/safe) "nXl" = ( /obj/effect/turf_decal/bot, +/mob/living/basic/pet/poppy, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nXn" = ( @@ -68339,6 +68344,7 @@ dir = 8 }, /obj/effect/landmark/event_spawn, +/mob/living/basic/bot/cleanbot/medbay, /turf/open/floor/iron/white, /area/station/medical/storage) "vQQ" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 20e02c8c92b6..0eb60baf8bab 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -13742,6 +13742,10 @@ "dkO" = ( /turf/open/floor/iron, /area/station/security/brig) +"dkU" = ( +/mob/living/basic/bot/cleanbot/medbay, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "dlb" = ( /obj/machinery/bluespace_beacon, /obj/effect/turf_decal/trimline/yellow/filled/warning, @@ -178636,7 +178640,7 @@ ecW dXo lTc lrQ -xOn +dkU gHp dHv xSZ diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index ef45726f6dc0..dfeff3080f4f 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -173,6 +173,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"eO" = ( +/obj/effect/turf_decal/bot, +/mob/living/basic/pet/poppy, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) "fc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/closed/wall/r_wall, @@ -1992,7 +2001,7 @@ Qi TL IC hr -YW +eO HS ze EI diff --git a/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm index 709c3188563d..8090eab80404 100644 --- a/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm @@ -818,6 +818,17 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) +"NK" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/mob/living/basic/pet/poppy, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "NN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -1205,7 +1216,7 @@ wE yn SK Qn -nu +NK nu UI GH diff --git a/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm index 6d8bdc12a033..479d17a6e334 100644 --- a/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm @@ -806,6 +806,11 @@ /area/station/engineering/supermatter/room) "Fs" = ( /obj/effect/turf_decal/bot, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Poppy's bed" + }, +/mob/living/basic/pet/poppy, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "FF" = (