Merge pull request #5084 from Heroman3003/fix-the-intercoms-already

Some intercom QoL
This commit is contained in:
Novacat
2019-04-17 19:18:02 -04:00
committed by GitHub
3 changed files with 582 additions and 431 deletions
+82 -75
View File
@@ -312,7 +312,7 @@
dir = 8
},
/obj/item/device/radio/intercom{
dir = 8;
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/white,
@@ -564,6 +564,10 @@
dir = 8
},
/obj/item/device/sleevemate,
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"bq" = (
@@ -1649,6 +1653,12 @@
/obj/machinery/light{
dir = 4
},
/obj/item/device/radio/intercom/department/security{
dir = 4;
icon_state = "secintercom";
pixel_x = 24;
pixel_y = 0
},
/turf/simulated/floor/carpet/blue,
/area/tether/surfacebase/security/breakroom)
"dq" = (
@@ -2017,7 +2027,7 @@
/area/tether/surfacebase/security/breakroom)
"dZ" = (
/obj/item/device/radio/intercom{
dir = 8;
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/carpet/blue,
@@ -4861,6 +4871,14 @@
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"iF" = (
/obj/machinery/portable_atmospherics/hydroponics/soil,
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
"iG" = (
/obj/structure/cable{
d1 = 4;
@@ -6873,7 +6891,7 @@
/obj/structure/table/glass,
/obj/item/weapon/material/ashtray/plastic,
/obj/item/device/radio/intercom{
dir = 8;
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/wood,
@@ -10505,7 +10523,7 @@
dir = 9
},
/obj/item/device/radio/intercom{
dir = 8;
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/white,
@@ -12123,6 +12141,14 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"vj" = (
/obj/machinery/light_construct{
icon_state = "tube-construct-stage1";
dir = 1
},
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"vk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12327,6 +12353,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"vF" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"vG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12690,6 +12721,14 @@
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"wm" = (
/obj/item/stack/material/wood{
amount = 10
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"wn" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -12708,6 +12747,11 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"wo" = (
/obj/machinery/light_construct,
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"wp" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lime/border,
@@ -12931,6 +12975,31 @@
"wJ" = (
/turf/simulated/wall,
/area/maintenance/lower/atrium)
"wK" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/mauve/bordercorner2{
dir = 5
},
/obj/effect/floor_decal/industrial/warning/corner,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/steel_grid,
/area/assembly/robotics)
"wL" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"wN" = (
/obj/structure/sign/directions/medical{
dir = 4;
@@ -13124,14 +13193,6 @@
/obj/structure/bed/chair/comfy/beige,
/turf/simulated/floor/carpet,
/area/vacant/vacant_library)
"xj" = (
/obj/machinery/light_construct{
icon_state = "tube-construct-stage1";
dir = 1
},
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"xk" = (
/obj/structure/bookcase,
/obj/item/weapon/book/manual/engineering_guide,
@@ -15826,14 +15887,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"Cc" = (
/obj/item/stack/material/wood{
amount = 10
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"Ch" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -16808,11 +16861,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"DJ" = (
/obj/machinery/light_construct,
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"DN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
@@ -17118,26 +17166,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/assembly/robotics)
"En" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/mauve/bordercorner2{
dir = 5
},
/obj/effect/floor_decal/industrial/warning/corner,
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/tiled/steel_grid,
/area/assembly/robotics)
"Eo" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
@@ -20958,11 +20986,6 @@
"Qr" = (
/turf/simulated/floor/lino,
/area/crew_quarters/bar)
"Qs" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/turf/simulated/floor/wood/broken,
/area/vacant/vacant_library)
"Qx" = (
/turf/simulated/wall,
/area/tether/surfacebase/public_garden_three)
@@ -21646,11 +21669,6 @@
/obj/machinery/door/airlock/glass_external/public,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"VB" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"VF" = (
/obj/machinery/light{
dir = 1
@@ -22103,17 +22121,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"Yz" = (
/obj/item/device/radio/intercom{
dir = 8;
listening = 1;
name = "Common Channel";
pixel_x = -21;
pixel_y = 0
},
/obj/machinery/portable_atmospherics/hydroponics/soil,
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
"YA" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -27177,7 +27184,7 @@ QC
VN
Zq
Zq
Yz
iF
QC
Op
ac
@@ -31198,7 +31205,7 @@ BO
jI
Da
DC
En
wK
EU
FU
FU
@@ -33459,9 +33466,9 @@ vh
vE
wh
Zv
xj
vj
Lm
Qs
vF
Wc
zR
Az
@@ -33469,7 +33476,7 @@ Az
LM
CJ
Dk
DJ
wo
Zv
Fk
Gb
@@ -33892,7 +33899,7 @@ xV
zT
Yh
Br
Cc
wm
Lm
xW
VX
@@ -36183,7 +36190,7 @@ Jr
Js
Wh
JE
VB
wL
IY
bg
RO
@@ -36325,7 +36332,7 @@ Js
Js
Jz
JE
VB
wL
IY
bg
RO
@@ -36467,7 +36474,7 @@ Jt
Js
Jz
JE
VB
wL
IY
bg
RO
+129 -98
View File
@@ -3581,24 +3581,34 @@
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"fG" = (
/obj/structure/shuttle/engine/propulsion{
/obj/machinery/photocopier,
/obj/item/device/radio/intercom{
dir = 8;
icon_state = "propulsion_l"
pixel_x = -24
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"fH" = (
/obj/structure/shuttle/engine/propulsion{
/obj/effect/floor_decal/borderfloor{
dir = 8;
icon_state = "borderfloor";
pixel_x = 0
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/turf/simulated/floor/tiled/dark,
/area/tether/station/public_meeting_room)
"fH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/virology)
"fI" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -3620,15 +3630,18 @@
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"fJ" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/item/weapon/tool/wrench,
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/steel,
/area/medical/biostorage)
"fK" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/bed/chair,
@@ -3641,10 +3654,32 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
"fM" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/techfloor,
/obj/item/device/sleevemate,
/obj/item/device/radio/intercom/department/medbay{
pixel_y = -24
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"fN" = (
/obj/random/trash_pile,
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"fO" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloorblack{
dir = 10
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 10
},
/obj/item/device/radio/intercom/department/medbay{
pixel_y = -24
},
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
"fP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3660,6 +3695,28 @@
},
/turf/simulated/floor/lino,
/area/chapel/office)
"fQ" = (
/obj/machinery/vending/coffee,
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/item/device/radio/intercom/department/medbay{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"fR" = (
/obj/structure/cable/pink{
icon_state = "1-2"
@@ -3781,6 +3838,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
"gd" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"ge" = (
/obj/effect/floor_decal/chapel{
dir = 1
@@ -3905,6 +3972,15 @@
},
/turf/simulated/floor/bluegrid,
/area/ai_upload)
"go" = (
/obj/structure/table/standard,
/obj/machinery/microwave,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"gp" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -4018,6 +4094,25 @@
},
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"gz" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"gA" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"gE" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -13769,15 +13864,6 @@
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"yt" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/item/weapon/tool/wrench,
/turf/simulated/floor/tiled/steel,
/area/medical/biostorage)
"yu" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9;
@@ -13874,12 +13960,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"yA" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/techfloor,
/obj/item/device/sleevemate,
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"yB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15870,16 +15950,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Bt" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloorblack{
dir = 10
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 10
},
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
"Bu" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -16124,24 +16194,6 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"BU" = (
/obj/machinery/vending/coffee,
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"BV" = (
/turf/simulated/floor/tiled,
/area/security/brig/visitation)
@@ -16345,11 +16397,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Cm" = (
/obj/structure/table/standard,
/obj/machinery/microwave,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Co" = (
/obj/structure/shuttle/engine/heater{
dir = 8
@@ -17545,22 +17592,6 @@
/obj/random/maintenance/security,
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
"KP" = (
/obj/machinery/photocopier,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = -24
},
/obj/effect/floor_decal/borderfloor{
dir = 8;
icon_state = "borderfloor";
pixel_x = 0
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/public_meeting_room)
"KQ" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -27808,7 +27839,7 @@ rj
rW
KI
tg
KP
fG
Sb
SW
Sp
@@ -27817,7 +27848,7 @@ vT
wZ
xu
xO
yt
fJ
yT
zd
vT
@@ -29237,7 +29268,7 @@ wx
xi
xy
xY
yA
fM
uW
zm
zN
@@ -29247,8 +29278,8 @@ AG
Bb
Bs
BJ
BU
Cm
fQ
go
CJ
CV
Dg
@@ -29671,7 +29702,7 @@ Aj
Ay
AK
AK
Bt
fO
BK
ac
ac
@@ -30076,7 +30107,7 @@ oW
pn
pV
qH
rs
fH
sf
sF
tp
@@ -30099,11 +30130,11 @@ AN
AN
Bw
yY
fG
fH
fH
fH
fJ
gd
gz
gz
gz
gA
yY
ac
ac
+371 -258
View File
@@ -231,6 +231,12 @@
icon_state = "camera";
dir = 8
},
/obj/item/device/radio/intercom/department/security{
dir = 4;
icon_state = "secintercom";
pixel_x = 24;
pixel_y = 0
},
/turf/simulated/floor/tiled/dark,
/area/security/range)
"ax" = (
@@ -1953,13 +1959,17 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/ai)
"dg" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 9
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/structure/table/steel,
/obj/machinery/recharger,
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
/obj/item/device/radio/intercom/department/security{
dir = 4;
icon_state = "secintercom";
pixel_x = 24;
pixel_y = 0
},
/turf/simulated/floor/wood,
/area/security/breakroom)
"dh" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12632,24 +12642,24 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"tP" = (
/obj/structure/table/woodentable,
/obj/item/device/taperecorder{
pixel_x = -4;
pixel_y = 2
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/turf/simulated/floor/wood,
/area/security/breakroom)
"tQ" = (
/obj/structure/table/woodentable,
/obj/item/device/taperecorder{
pixel_x = -4;
pixel_y = 2
/obj/effect/floor_decal/borderfloorblack{
dir = 9
},
/obj/machinery/camera/network/security{
dir = 1
/obj/structure/table/steel,
/obj/machinery/recharger,
/obj/item/device/radio/intercom/department/security{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
"tR" = (
/obj/machinery/power/apc{
dir = 2;
@@ -19124,24 +19134,17 @@
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"DV" = (
/obj/machinery/chemical_dispenser/full,
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 9
/obj/structure/table/woodentable,
/obj/item/device/taperecorder{
pixel_x = -4;
pixel_y = 2
},
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
dir = 2;
pixel_y = -24
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"DW" = (
/obj/structure/table/reinforced,
/obj/item/weapon/reagent_containers/glass/beaker/large,
@@ -19485,17 +19488,19 @@
/turf/simulated/floor/tiled,
/area/tether/station/stairs_three)
"EG" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
/obj/structure/table/woodentable,
/obj/item/device/taperecorder{
pixel_x = -4;
pixel_y = 2
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
/obj/machinery/camera/network/security{
dir = 1
},
/obj/structure/filingcabinet/chestdrawer{
name = "Medical Forms"
/obj/item/device/radio/intercom/department/security{
pixel_y = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"EH" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/white,
@@ -19896,18 +19901,28 @@
/turf/simulated/open,
/area/tether/station/stairs_three)
"Fv" = (
/obj/machinery/chemical_dispenser/full,
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
dir = 9
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
dir = 9
},
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/obj/machinery/light{
dir = 8
},
/obj/machinery/photocopier,
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
/area/medical/chemistry)
"Fw" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -20181,18 +20196,38 @@
/turf/simulated/floor/carpet/blue,
/area/medical/psych)
"FS" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
},
/obj/structure/filingcabinet/chestdrawer{
name = "Medical Forms"
},
/turf/simulated/floor/carpet/blue,
/area/medical/psych)
"FT" = (
/obj/structure/filingcabinet/medical{
desc = "A large cabinet with hard copy medical records.";
name = "Medical Records"
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/carpet/blue,
/area/medical/psych)
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"FT" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
},
/obj/machinery/light{
dir = 8
},
/obj/machinery/photocopier,
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"FU" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -21003,25 +21038,15 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
"Hp" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/spray/cleaner{
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
name = "Surgery Cleaner";
pixel_x = 2;
pixel_y = 2
/obj/structure/filingcabinet/chestdrawer{
name = "Medical Forms"
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
/obj/item/device/radio/intercom{
dir = 2;
pixel_y = -24
},
/obj/effect/floor_decal/corner/white/border{
dir = 5
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
/turf/simulated/floor/carpet/blue,
/area/medical/psych)
"Hq" = (
/turf/simulated/wall,
/area/medical/surgery)
@@ -21246,6 +21271,16 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/maintenance/security_starboard)
"HL" = (
/obj/structure/filingcabinet/medical{
desc = "A large cabinet with hard copy medical records.";
name = "Medical Records"
},
/obj/item/device/radio/intercom/department/medbay{
pixel_y = -24
},
/turf/simulated/floor/carpet/blue,
/area/medical/psych)
"HM" = (
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
@@ -22145,6 +22180,30 @@
/turf/simulated/floor/tiled,
/area/medical/resleeving)
"Je" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/spray/cleaner{
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
name = "Surgery Cleaner";
pixel_x = 2;
pixel_y = 2
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
},
/obj/effect/floor_decal/corner/white/border{
dir = 5
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/obj/item/device/radio/intercom/department/medbay{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
"Jf" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
@@ -22163,30 +22222,11 @@
pixel_x = 3;
pixel_y = 3
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
"Jf" = (
/obj/structure/closet{
name = "spare clothes"
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/obj/item/clothing/under/color/black,
/obj/item/clothing/under/color/black,
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/white,
/obj/item/clothing/under/color/white,
/obj/item/clothing/under/color/blue,
/obj/item/clothing/under/color/green,
/obj/item/clothing/under/color/lightpurple,
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 5
},
/obj/item/device/radio/headset,
/obj/item/device/radio/headset,
/obj/item/device/radio/headset,
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
"Jg" = (
@@ -22717,6 +22757,34 @@
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Ka" = (
/obj/structure/closet{
name = "spare clothes"
},
/obj/item/clothing/under/color/black,
/obj/item/clothing/under/color/black,
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/white,
/obj/item/clothing/under/color/white,
/obj/item/clothing/under/color/blue,
/obj/item/clothing/under/color/green,
/obj/item/clothing/under/color/lightpurple,
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 5
},
/obj/item/device/radio/headset,
/obj/item/device/radio/headset,
/obj/item/device/radio/headset,
/obj/item/device/radio/intercom/department/medbay{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
"Kb" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -23055,6 +23123,30 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
"KD" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/spray/cleaner{
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
name = "Surgery Cleaner";
pixel_x = 2;
pixel_y = 2
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
},
/obj/effect/floor_decal/corner/white/border{
dir = 5
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/obj/item/device/radio/intercom/department/medbay{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"KE" = (
/obj/structure/cable/green{
d1 = 2;
@@ -23432,6 +23524,33 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Lo" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloorwhite{
dir = 6
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 6
},
/obj/random/medical,
/obj/random/medical,
/obj/item/device/glasses_kit,
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
pixel_x = 28
},
/obj/item/weapon/storage/box/rxglasses,
/obj/item/weapon/storage/box/rxglasses,
/obj/item/device/radio/intercom/department/medbay{
pixel_y = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"Lp" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -23521,6 +23640,22 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"Lw" = (
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
/obj/structure/disposalpipe/trunk,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"Lx" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -23583,25 +23718,26 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"LB" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/spray/cleaner{
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
name = "Surgery Cleaner";
pixel_x = 2;
pixel_y = 2
},
/obj/structure/closet/secure_closet/CMO,
/obj/item/weapon/cmo_disk_holder,
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
dir = 1
},
/obj/effect/floor_decal/corner/white/border{
dir = 5
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/device/flashlight/pen,
/obj/item/weapon/storage/belt/medical,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/accessory/stethoscope,
/obj/item/device/defib_kit/compact/combat/loaded,
/obj/item/device/radio/intercom/department/medbay{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
/area/crew_quarters/heads/cmo)
"LC" = (
/obj/structure/cable/green{
d1 = 1;
@@ -24039,29 +24175,38 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"Mo" = (
/obj/structure/table/glass,
/obj/machinery/button/windowtint{
id = "exam_room";
pixel_y = 26
},
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 0;
pixel_y = 36
},
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloorwhite{
dir = 6
dir = 9
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 6
/obj/effect/floor_decal/corner/pink/border{
dir = 9
},
/obj/random/medical,
/obj/random/medical,
/obj/item/device/glasses_kit,
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
/obj/effect/floor_decal/borderfloorwhite/corner2{
dir = 1
},
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
pixel_x = 28
/obj/effect/floor_decal/corner/pink/bordercorner2{
dir = 1
},
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/obj/item/weapon/storage/box/rxglasses,
/obj/item/weapon/storage/box/rxglasses,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
/area/medical/exam_room)
"Mp" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/blood/AMinus,
@@ -24240,33 +24385,40 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"MB" = (
/obj/machinery/disposal,
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/medical,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
dir = 4
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
dir = 4
},
/obj/item/device/radio/intercom/department/medbay{
dir = 4;
pixel_x = 24
},
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
/area/medical/ward)
"MC" = (
/obj/structure/closet/secure_closet/CMO,
/obj/item/weapon/cmo_disk_holder,
/obj/structure/table/glass,
/obj/item/weapon/clipboard,
/obj/item/weapon/paper_bin,
/obj/item/weapon/pen,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
dir = 10
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/device/flashlight/pen,
/obj/item/weapon/storage/belt/medical,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/accessory/stethoscope,
/obj/item/device/defib_kit/compact/combat/loaded,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
/area/medical/patient_a)
"MD" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -24282,6 +24434,25 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"ME" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/weapon/clipboard,
/obj/item/weapon/pen,
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"MF" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -24416,6 +24587,25 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"MO" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/weapon/clipboard,
/obj/item/weapon/pen,
/obj/item/device/radio/intercom/department/medbay{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_c)
"MP" = (
/obj/structure/table/glass,
/obj/item/weapon/paper_bin,
@@ -24896,6 +25086,21 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"Nr" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/medical,
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 4
},
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/ward)
"Ns" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/borderfloorwhite,
@@ -25931,35 +26136,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/ward)
"OZ" = (
/obj/machinery/button/windowtint{
id = "exam_room";
pixel_y = 26
},
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 0;
pixel_y = 36
},
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
},
/obj/effect/floor_decal/corner/pink/border{
dir = 9
},
/obj/effect/floor_decal/borderfloorwhite/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/pink/bordercorner2{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/medical/exam_room)
"Pa" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -26458,17 +26634,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/ward)
"PP" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/medical,
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/ward)
"PQ" = (
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/super;
@@ -26826,22 +26991,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/exam_room)
"Qt" = (
/obj/structure/table/glass,
/obj/item/weapon/clipboard,
/obj/item/weapon/paper_bin,
/obj/item/weapon/pen,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_a)
"Qu" = (
/obj/structure/bed/chair/office/light{
dir = 1
@@ -26873,21 +27022,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_a)
"Qw" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/weapon/clipboard,
/obj/item/weapon/pen,
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"Qx" = (
/obj/structure/bed/chair/office/light{
dir = 1
@@ -26919,21 +27053,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"Qz" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/obj/effect/floor_decal/corner/pink/border{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/weapon/clipboard,
/obj/item/weapon/pen,
/turf/simulated/floor/tiled/white,
/area/medical/patient_c)
"QA" = (
/obj/structure/bed/chair/office/light{
dir = 1
@@ -27709,12 +27828,6 @@
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
"WX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/wood,
/area/security/breakroom)
"WY" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
@@ -32980,7 +33093,7 @@ ja
ja
kc
ko
dg
tQ
kK
kY
eT
@@ -33281,7 +33394,7 @@ qF
rn
si
sT
tP
DV
uJ
vu
nn
@@ -33423,7 +33536,7 @@ qG
ro
sj
sT
tQ
EG
uJ
vv
wg
@@ -34158,7 +34271,7 @@ Kz
Lb
LI
Me
MB
Lw
MQ
NA
NQ
@@ -34294,13 +34407,13 @@ Gj
GT
Gu
Ix
Je
Jf
JV
KA
Lc
LJ
Me
MC
LB
MR
NB
NR
@@ -34436,7 +34549,7 @@ Df
Df
Df
Ix
Jf
Ka
pD
KB
Ld
@@ -34998,8 +35111,8 @@ Bs
Ck
Dj
DM
EG
Fv
FS
FT
Gl
GU
nf
@@ -36295,9 +36408,9 @@ Oc
yl
OY
Pv
PP
MB
Qo
PP
Nr
QO
QR
Jg
@@ -36417,7 +36530,7 @@ Ao
By
Cs
Dp
DV
Fv
EQ
FF
Gv
@@ -36577,7 +36690,7 @@ Nh
KI
Od
tt
OZ
Mo
Pw
PQ
Qp
@@ -36951,8 +37064,8 @@ iH
iT
YT
ni
WX
eJ
dg
tP
en
eF
Xe
@@ -36997,7 +37110,7 @@ Kk
KP
Lu
LV
Mo
Lo
Jr
Nk
NI
@@ -37290,7 +37403,7 @@ OB
AA
PA
PU
Qt
MC
Gn
vt
vt
@@ -37858,7 +37971,7 @@ OF
Bf
PD
PX
Qw
ME
Hk
vt
vt
@@ -38409,13 +38522,13 @@ Eg
Fa
FQ
zD
Hp
Je
Ii
IN
JE
Ks
KV
LB
KD
Mb
Mv
ML
@@ -38426,7 +38539,7 @@ OF
BB
PG
Qa
Qz
MO
HM
vt
vt
@@ -38691,7 +38804,7 @@ BF
BF
Ei
Fc
FS
Hp
zD
ab
ab
@@ -38833,7 +38946,7 @@ Cx
Du
ou
Ef
FT
HL
zD
ab
ab