From 88323a11215ef910eec47cc9d33e9ecb047d2768 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 4 Jan 2020 07:42:57 +1000 Subject: [PATCH] Removes genetic mutations, removes cryotubes from resleeving labs --- code/modules/resleeving/machines.dm | 6 - maps/tether/tether-02-surface2.dmm | 345 ++++++++++++---------------- maps/tether/tether-06-station2.dmm | 233 ++++++++----------- 3 files changed, 242 insertions(+), 342 deletions(-) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 1763babcfbe..3df3ff8053b 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -89,12 +89,6 @@ H.Paralyse(4) H.updatehealth() - //Grower specific mutations - if(heal_level < 60) - randmutb(H) - H.dna.UpdateSE() - H.dna.UpdateUI() - //Update appearance, remake icons H.UpdateAppearance() H.sync_organ_dna() diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 68c6a1a533a..45de27b05aa 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -299,21 +299,29 @@ dir = 1 }, /obj/machinery/clonepod/transhuman, -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aaI" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, -/obj/machinery/camera/network/medbay, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/glass, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aaJ" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -404,9 +412,27 @@ /turf/simulated/floor, /area/maintenance/lower/north) "aaQ" = ( -/obj/machinery/atmospherics/unary/cryo_cell, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/machinery/alarm{ + pixel_x = 0; + pixel_y = 28 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/device/flashlight/pen{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aaR" = ( /obj/effect/decal/cleanable/dirt, @@ -462,42 +488,14 @@ /turf/simulated/floor, /area/maintenance/substation/medsec) "aaW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/machinery/alarm{ - pixel_x = 0; - pixel_y = 28 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, +/obj/structure/curtain/open/shower/medical, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "aaX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2060,10 +2058,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "aeu" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -2071,6 +2065,8 @@ icon_state = "bulb1"; dir = 1 }, +/obj/structure/table/standard, +/obj/random/soap, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "aev" = ( @@ -22519,25 +22515,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aPJ" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aPK" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/tiled/white, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "aPL" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "aPM" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -22559,22 +22555,21 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aPN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aPO" = ( -/obj/machinery/atmospherics/unary/freezer, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aPP" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -22862,39 +22857,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aQl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) -"aQm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) -"aQn" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -22903,7 +22869,7 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"aQo" = ( +"aQm" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ id_tag = null; @@ -22913,17 +22879,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"aQp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +"aQn" = ( /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -22935,11 +22896,7 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) -"aQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" - }, +"aQo" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -22960,6 +22917,30 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) +"aQp" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"aQq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "aQr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -23348,17 +23329,27 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aQS" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/structure/table/glass, +/obj/item/weapon/book/manual/resleeving, +/obj/item/device/radio/intercom{ + dir = 2; + pixel_y = -24 + }, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 }, /obj/effect/floor_decal/borderfloorwhite{ - dir = 8 + dir = 6 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 + dir = 6 + }, +/obj/item/device/sleevemate, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) +/area/tether/surfacebase/medical/resleeving) "aQT" = ( /obj/structure/cable/green{ d1 = 1; @@ -23371,15 +23362,26 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aQU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/effect/floor_decal/borderfloorwhite{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aQV" = ( @@ -23502,31 +23504,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aRe" = ( -/obj/structure/table/glass, -/obj/item/weapon/book/manual/resleeving, -/obj/item/device/radio/intercom{ - dir = 2; - pixel_y = -24 - }, -/obj/structure/sign/nosmoking_1{ - pixel_x = 32 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 6 - }, -/obj/item/device/sleevemate, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, -/obj/item/device/flashlight/pen{ - pixel_x = -3; - pixel_y = -3 - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) +/area/tether/surfacebase/medical/lowerhall) "aRf" = ( /obj/machinery/washing_machine, /obj/effect/floor_decal/techfloor{ @@ -24228,29 +24212,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) -"aSf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) "aSg" = ( /obj/structure/cable/green{ d1 = 1; @@ -24905,14 +24866,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"aTi" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) "aTj" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -42454,7 +42407,7 @@ aaf aaf aQc aQB -aQS +aQp aRr aPp aSa @@ -42738,7 +42691,7 @@ aar aPC aaf aQD -aQU +aQq aRt aRG aSb @@ -43734,9 +43687,9 @@ aah aah aah aah -aSf +aQU aTb -aTi +aRe aad aba aai @@ -44013,7 +43966,7 @@ aab aac aah aaH -aPJ +aQK aQk aQK aRb @@ -44154,9 +44107,9 @@ aab aab aab aah -aaQ -aPK -aQl +aaI +aQK +aPN aQL aRc aRx @@ -44296,9 +44249,9 @@ aab aab aab aah -aaW -aPL -aQm +aaQ +aPJ +aPO aQM aRd aRw @@ -44440,9 +44393,9 @@ aab aah aaE aPM -aQn +aQl aQN -aRe +aQS aah aQb aSh @@ -44582,7 +44535,7 @@ aab aah aah aah -aQo +aQm aah aah aah @@ -44722,9 +44675,9 @@ aab aab aab aah -aaI -aPN -aQp +aaW +aPK +aQn aQO aRf aah @@ -44865,8 +44818,8 @@ aab aab aah aeu -aPO -aQq +aPL +aQo aQP aRg aah diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index e052f8ae0f2..87899de6b21 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -13354,15 +13354,17 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "tX" = ( -/obj/machinery/atmospherics/unary/cryo_cell, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/table/glass, +/turf/simulated/floor/tiled/white, /area/medical/resleeving) "tY" = ( /obj/structure/cable/green{ @@ -13544,15 +13546,32 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "uq" = ( -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/techfloor{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/camera/network/medbay, +/turf/simulated/floor/tiled/white, /area/medical/resleeving) "ur" = ( -/obj/machinery/atmospherics/unary/freezer, +/obj/machinery/shower{ + dir = 4; + icon_state = "shower"; + pixel_x = 2; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/structure/curtain/open/shower/medical, +/turf/simulated/floor/tiled/dark, +/area/medical/resleeving) +"us" = ( /obj/machinery/light/small{ icon_state = "bulb1"; dir = 1 @@ -13560,18 +13579,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/medical/resleeving) -"us" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/medical/resleeving) "ut" = ( @@ -14028,6 +14036,18 @@ /turf/simulated/floor/tiled/white, /area/medical/resleeving) "vf" = ( +/obj/structure/table/standard, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/random/soap, +/turf/simulated/floor/tiled/dark, +/area/medical/resleeving) +"vg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -14035,13 +14055,9 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"vg" = ( +"vh" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14050,27 +14066,6 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/resleeving) -"vh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "vi" = ( @@ -14236,8 +14231,14 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; +/turf/simulated/floor/tiled/white, +/area/medical/resleeving) +"vx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14248,7 +14249,7 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"vx" = ( +"vy" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ id_tag = null; @@ -14262,26 +14263,8 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"vy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/resleeving) "vz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14290,27 +14273,20 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/medical/resleeving) "vA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, /obj/effect/floor_decal/techfloor, -/obj/machinery/camera/network/medbay{ - icon_state = "camera"; - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/medical/resleeving) "vB" = ( @@ -15219,6 +15195,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) +"wY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/medical/resleeving) "wZ" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -15249,23 +15237,22 @@ /turf/simulated/wall, /area/medical/surgery) "xc" = ( -/obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 +/obj/machinery/shower{ + pixel_y = 10 }, -/obj/effect/floor_decal/borderfloorwhite{ +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 }, -/obj/machinery/camera/network/medbay, +/obj/structure/curtain/open/shower/medical, /turf/simulated/floor/tiled/white, -/area/medical/resleeving) +/area/medical/recoveryrestroom) "xd" = ( /obj/structure/cable/green{ d1 = 1; @@ -18198,23 +18185,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"Cd" = ( -/obj/structure/curtain/open/shower, -/obj/machinery/shower{ - pixel_y = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/recoveryrestroom) "Ce" = ( /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -20194,23 +20164,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"Fj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/resleeving) "Fk" = ( /obj/structure/cable{ d1 = 4; @@ -33259,7 +33212,7 @@ AP Bh Bz BM -Cd +xc Cx Cz CX @@ -33385,7 +33338,7 @@ sm tg tu tW -vf +vg wh wG xf @@ -33527,7 +33480,7 @@ sn th tu tX -vg +vh wi wH xf @@ -33668,8 +33621,8 @@ pV so ti tu -xc -Fj +uq +vw wi wI xf @@ -33811,7 +33764,7 @@ sC tj tv tZ -vh +vw wi wJ xf @@ -33953,7 +33906,7 @@ sD tk tu ua -vh +vw wj wK xg @@ -34095,7 +34048,7 @@ sE tl tu ub -vw +vx wk wL xg @@ -34237,7 +34190,7 @@ uW uW tu tu -vx +vy yJ yJ yJ @@ -34378,8 +34331,8 @@ ac ac ac tu -uq -vy +ur +vz yJ eT eT @@ -34520,8 +34473,8 @@ ac ac ac tu -ur -vz +us +vA yJ eT eT @@ -34662,8 +34615,8 @@ ac ac ac tu -us -vA +vf +wY yJ eT eT