diff --git a/html/changelogs/small_medbay_tweaks.yml b/html/changelogs/small_medbay_tweaks.yml new file mode 100644 index 00000000000..19f817e3620 --- /dev/null +++ b/html/changelogs/small_medbay_tweaks.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: UncleJo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Removed the wall that was left smack dab in the middle of the General Treatment Room to house the GTR's APC and intercom unit. The intercom is gone as well." + - tweak: "Relocated one of the General Treatment Room's cryo pods into the Intensive Care Unit to make room for the GTR's APC, along with an extra table." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 763f972cb41..dbccdb0de36 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -31582,20 +31582,10 @@ /obj/effect/floor_decal/corner/beige{ dir = 6 }, -/obj/structure/table/standard, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/machinery/firealarm/north, +/obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/tiled/dark, /area/medical/icu) "bca" = ( @@ -31631,9 +31621,7 @@ /obj/machinery/body_scanconsole{ dir = 4 }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 32 - }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled/dark, /area/medical/icu) "bcc" = ( @@ -32435,10 +32423,10 @@ /obj/effect/floor_decal/corner/beige/full{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 }, -/obj/machinery/meter, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, @@ -32453,6 +32441,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/medical/icu) "bdF" = ( @@ -34008,9 +33997,16 @@ c_tag = "Medical - Intensive Care Unit"; dir = 4 }, -/obj/structure/bed/chair/plastic{ - dir = 4 +/obj/structure/table/standard, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -5; + pixel_y = 5 }, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/tiled/white, /area/medical/icu) "bgq" = ( @@ -34042,6 +34038,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "bgt" = ( @@ -39682,13 +39681,22 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "bqI" = ( -/obj/machinery/atmospherics/unary/cryo_cell, /obj/effect/floor_decal/corner/beige{ dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/power/apc{ + dir = 1; + name = "west bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "bqJ" = ( @@ -39718,6 +39726,10 @@ /obj/machinery/sleeper{ dir = 8 }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "bqM" = ( @@ -40119,20 +40131,29 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "brN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/floor_decal/corner/beige/full{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "brO" = ( @@ -40160,10 +40181,6 @@ c_tag = "Medical - General Treatment 1"; dir = 8 }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /obj/structure/table/standard, /obj/item/device/mass_spectrometer, /turf/simulated/floor/tiled/dark, @@ -41844,30 +41861,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"bvr" = ( -/obj/item/device/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = 24 - }, -/obj/effect/floor_decal/corner_wide/lime{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"bvs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/white, -/area/medical/gen_treatment) "bvt" = ( /obj/machinery/body_scanconsole{ dir = 4 @@ -103766,7 +103759,7 @@ bqG brK bqG bqG -bvr +bqG bwg bqG brK @@ -104023,7 +104016,7 @@ bpD brL btc btc -bpA +btc bwh btc brL @@ -104278,9 +104271,9 @@ boh bpA bqH brM -bqJ -bqJ -bvs +bzc +bzc +bzc bwi bzc bzc