diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 307ef819014..07d234f96f7 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -1984,6 +1984,16 @@
/obj/item/deck/unum,
/turf/simulated/floor/wood,
/area/ghost_bar)
+"hh" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/havana_cigar{
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "vault"
+ },
+/area/tdome/tdomeadmin)
"hi" = (
/obj/machinery/light/spot{
dir = 8
@@ -2554,6 +2564,29 @@
icon_state = "cafeteria"
},
/area/tdome/tdomeobserve)
+"iK" = (
+/obj/structure/table/wood,
+/obj/machinery/door_control/no_emag{
+ id = "specopsoffice";
+ name = "Privacy Shutters";
+ pixel_x = 6;
+ pixel_y = 10;
+ req_access = list(114)
+ },
+/obj/machinery/door_control/no_emag{
+ pixel_x = -6;
+ pixel_y = -17;
+ name = "Engineering Storage";
+ id = "SpecopsEngineering";
+ req_access = list(114)
+ },
+/obj/item/folder/red,
+/obj/machinery/phone/centcomm{
+ pixel_x = 7;
+ pixel_y = -14
+ },
+/turf/simulated/floor/carpet,
+/area/centcom/specops)
"iL" = (
/obj/machinery/door_control/no_emag{
id = "sst_armory";
@@ -7169,6 +7202,13 @@
},
/turf/simulated/floor/wood,
/area/centcom/control)
+"yh" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigars/cohiba{
+ pixel_y = 8
+ },
+/turf/simulated/floor/transparent/glass,
+/area/centcom/specops)
"yj" = (
/obj/structure/table/wood/fancy/royalblack,
/obj/item/gun/projectile/automatic/pistol,
@@ -8557,30 +8597,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/wood,
/area/ghost_bar)
-"Dn" = (
-/obj/structure/table/wood,
-/obj/machinery/door_control/no_emag{
- id = "specopsoffice";
- name = "Privacy Shutters";
- pixel_x = 6;
- pixel_y = 10;
- req_access = list(114)
- },
-/obj/machinery/door_control/no_emag{
- pixel_x = -6;
- pixel_y = -17;
- name = "Engineering Storage";
- id = "SpecopsEngineering";
- req_access = list(114)
- },
-/obj/item/folder/red,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -5;
- pixel_y = 3
- },
-/turf/simulated/floor/carpet,
-/area/centcom/specops)
"Do" = (
/turf/simulated/floor/engine,
/area/admin)
@@ -10908,11 +10924,6 @@
/area/shuttle/escape)
"KI" = (
/obj/structure/table,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/wood,
/area/centcom/evac)
"KJ" = (
@@ -11421,16 +11432,6 @@
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
-"Mp" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/havana_cigar{
- pixel_x = 3;
- pixel_y = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "vault"
- },
-/area/tdome/tdomeadmin)
"Mq" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/machinery/computer/security/telescreen,
@@ -12801,6 +12802,21 @@
},
/turf/simulated/floor/carpet/black,
/area/ghost_bar)
+"Qw" = (
+/obj/structure/table/wood,
+/obj/machinery/newscaster/directional/north,
+/obj/item/storage/fancy/cigars/cohiba{
+ pixel_y = 8
+ },
+/obj/item/lighter/zippo/nt_rep{
+ pixel_x = -16;
+ pixel_y = 3
+ },
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "vault"
+ },
+/area/centcom/specops)
"Qx" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -14562,13 +14578,6 @@
/obj/machinery/teleport/station/upgraded,
/turf/simulated/floor/plasteel,
/area/admin)
-"Wy" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigars/cohiba{
- pixel_y = 8
- },
-/turf/simulated/floor/transparent/glass,
-/area/centcom/specops)
"Wz" = (
/obj/machinery/teleport/hub/upgraded{
admin_usage = 1
@@ -15483,21 +15492,6 @@
icon_state = "vault"
},
/area/centcom/specops)
-"Zd" = (
-/obj/structure/table/wood,
-/obj/machinery/newscaster/directional/north,
-/obj/item/storage/fancy/cigars/cohiba{
- pixel_y = 8
- },
-/obj/item/lighter/zippo/nt_rep{
- pixel_x = -16;
- pixel_y = 3
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/centcom/specops)
"Ze" = (
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
@@ -34192,7 +34186,7 @@ TR
WQ
TR
Zr
-Zd
+Qw
Ra
Ra
Ra
@@ -34716,7 +34710,7 @@ kL
VI
Ra
Wp
-Wy
+yh
Yx
Yx
Zr
@@ -35486,7 +35480,7 @@ zg
Xz
RW
Jv
-Dn
+iK
MQ
ZQ
Kh
@@ -39874,7 +39868,7 @@ SV
wt
sj
sj
-Mp
+hh
Jh
aN
aN
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 174539de977..ad3f0153b92 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -790,6 +790,10 @@
"aeC" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/drinks/mug/hos,
+/obj/machinery/phone{
+ pixel_y = 14;
+ pixel_x = 6
+ },
/turf/simulated/floor/carpet,
/area/station/command/office/hos)
"aeD" = (
@@ -7785,6 +7789,10 @@
/obj/structure/table/reinforced,
/obj/item/stamp/magistrate,
/obj/item/paper_bin/nanotrasen,
+/obj/machinery/phone{
+ pixel_x = 17;
+ pixel_y = 9
+ },
/turf/simulated/floor/carpet,
/area/station/legal/magistrate)
"aCl" = (
@@ -19777,8 +19785,15 @@
/area/station/command/bridge)
"bpr" = (
/obj/structure/table/reinforced,
-/obj/item/flash,
-/obj/item/flash,
+/obj/item/flash{
+ pixel_y = -11
+ },
+/obj/machinery/phone{
+ pixel_y = 3
+ },
+/obj/item/flash{
+ pixel_y = -11
+ },
/turf/simulated/floor/plasteel,
/area/station/command/bridge)
"bpt" = (
@@ -28190,6 +28205,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/phone,
/turf/simulated/floor/carpet,
/area/station/supply/qm)
"bXh" = (
@@ -29150,14 +29166,27 @@
/area/station/command/office/cmo)
"caR" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/drinks/coffee,
+/obj/item/reagent_containers/drinks/coffee{
+ pixel_y = 15;
+ pixel_x = 11
+ },
/obj/machinery/power/apc/directional/east,
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/item/cartridge/chemistry,
-/obj/item/cartridge/medical,
-/obj/item/cartridge/medical,
+/obj/item/cartridge/chemistry{
+ pixel_x = -14
+ },
+/obj/item/cartridge/medical{
+ pixel_x = -16
+ },
+/obj/machinery/phone{
+ pixel_y = 1;
+ pixel_x = 2
+ },
+/obj/item/cartridge/medical{
+ pixel_x = -18
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -30125,9 +30154,16 @@
},
/area/station/science/server/coldroom)
"ceN" = (
-/obj/item/paper/monitorkey,
-/obj/item/megaphone,
+/obj/item/megaphone{
+ pixel_y = -16;
+ pixel_x = 4
+ },
/obj/structure/table/glass,
+/obj/item/paper_bin/nanotrasen{
+ pixel_x = -5
+ },
+/obj/item/paper/monitorkey,
+/obj/item/pen/multi,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkpurple"
@@ -30921,8 +30957,6 @@
/area/station/command/office/rd)
"chO" = (
/obj/structure/table/glass,
-/obj/item/pen/multi,
-/obj/item/paper_bin/nanotrasen,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -30931,7 +30965,13 @@
c_tag = "Research Director's Office";
network = list("Research","SS13")
},
-/obj/item/reagent_containers/drinks/mug/rd,
+/obj/item/reagent_containers/drinks/mug/rd{
+ pixel_y = -12;
+ pixel_x = 7
+ },
+/obj/machinery/phone{
+ pixel_y = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkpurple"
@@ -31456,14 +31496,6 @@
"ckr" = (
/turf/simulated/wall,
/area/station/medical/medbay3)
-"ckt" = (
-/obj/structure/table/wood,
-/obj/machinery/photocopier/faxmachine/longrange{
- department = "NT Representative's Office";
- pixel_y = 4
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
"ckv" = (
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
@@ -32484,18 +32516,13 @@
icon_state = "brown"
},
/area/station/supply/expedition)
-"coo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigars{
- pixel_y = 8
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
"cop" = (
/obj/machinery/alarm/directional/east,
/obj/structure/table/wood,
-/obj/item/paper_bin/nanotrasen,
+/obj/machinery/photocopier/faxmachine/longrange{
+ department = "NT Representative's Office";
+ pixel_y = 4
+ },
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"cot" = (
@@ -32820,6 +32847,14 @@
pixel_y = 3;
req_access = list(57)
},
+/obj/machinery/phone{
+ pixel_y = 14;
+ pixel_x = 6
+ },
+/obj/item/megaphone{
+ pixel_y = -3;
+ pixel_x = -3
+ },
/turf/simulated/floor/carpet/grimey,
/area/station/command/office/hop)
"cpW" = (
@@ -38496,17 +38531,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
-"cLE" = (
-/obj/structure/table/wood,
-/obj/item/paper/ntrep,
-/obj/item/stamp/rep,
-/obj/item/folder,
-/obj/item/ashtray/glass{
- pixel_x = 16;
- pixel_y = 2
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
"cLF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -46757,6 +46781,10 @@
/obj/item/folder/yellow,
/obj/item/stamp/ce,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/phone{
+ pixel_x = -6;
+ pixel_y = 16
+ },
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
"dsU" = (
@@ -59032,6 +59060,14 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/cmo)
+"jkq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/table/wood,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"jkw" = (
/obj/structure/flora/rock/jungle,
/turf/simulated/floor/grass,
@@ -63969,6 +64005,13 @@
/obj/structure/flora/grass/jungle,
/turf/simulated/floor/grass/jungle/no_creep,
/area/station/command/bridge)
+"lBU" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigars{
+ pixel_y = 8
+ },
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"lCQ" = (
/obj/structure/closet/emcloset,
/obj/structure/sign/poster/official/random/directional/west,
@@ -68606,7 +68649,6 @@
specialfunctions = 4;
pixel_y = 34
},
-/obj/item/phone,
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
"nVf" = (
@@ -72629,9 +72671,6 @@
pixel_x = 6;
pixel_y = 4
},
-/obj/item/megaphone{
- pixel_y = -11
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -75654,6 +75693,24 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/asmaint)
+"rfT" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin/nanotrasen,
+/obj/item/paper/ntrep{
+ pixel_y = 3;
+ pixel_x = 3
+ },
+/obj/item/folder{
+ pixel_y = 0;
+ pixel_x = -15
+ },
+/obj/item/ashtray/glass{
+ pixel_x = 13;
+ pixel_y = 2
+ },
+/obj/item/stamp/rep,
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"rgb" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -76696,16 +76753,23 @@
/area/station/hallway/secondary/entry/lounge)
"rGE" = (
/obj/structure/table/wood,
-/obj/item/folder/blue,
+/obj/item/folder/blue{
+ pixel_x = -15
+ },
/obj/item/stamp/captain{
- pixel_x = -10
+ pixel_x = -15
},
/obj/machinery/door_control{
id = "captainofficedoor";
name = "Office Door";
normaldoorcontrol = 1;
- pixel_y = -3;
- req_access = list(20)
+ pixel_y = -2;
+ req_access = list(20);
+ pixel_x = 7
+ },
+/obj/machinery/phone{
+ pixel_y = 9;
+ pixel_x = 8
},
/turf/simulated/floor/carpet/royalblue,
/area/station/command/office/captain)
@@ -86348,7 +86412,6 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/item/phone,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -117356,7 +117419,7 @@ wuu
rvo
ciB
bAb
-ckt
+lBU
coU
cgW
cvf
@@ -117613,7 +117676,7 @@ cqI
fMD
clL
cmM
-coo
+jkq
xty
cgW
cqs
@@ -117870,7 +117933,7 @@ cdN
kHO
ckv
cqJ
-cLE
+rfT
cnu
cgW
cqs
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 5a229f8c199..1fbf4a53d64 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -3322,6 +3322,10 @@
pixel_x = 7;
pixel_y = -24
},
+/obj/machinery/phone{
+ pixel_x = 7;
+ pixel_y = 15
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hos)
"axW" = (
@@ -5764,9 +5768,8 @@
"aVg" = (
/obj/structure/table/wood,
/obj/item/melee/chainofcommand,
-/obj/item/radio/phone{
- pixel_x = -5;
- pixel_y = -4
+/obj/machinery/phone{
+ pixel_y = 2
},
/turf/simulated/floor/wood,
/area/station/command/office/captain)
@@ -13289,6 +13292,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/item/taperecorder{
+ pixel_x = -12;
+ pixel_y = 4
+ },
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
"bUK" = (
@@ -19247,11 +19254,12 @@
/area/station/service/theatre)
"cNz" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/black,
/area/station/legal/magistrate)
"cNB" = (
@@ -25418,6 +25426,10 @@
},
/obj/item/lighter/zippo/engraved,
/obj/structure/table,
+/obj/machinery/phone{
+ pixel_x = -15;
+ pixel_y = 7
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
@@ -47575,6 +47587,8 @@
/area/station/hallway/primary/fore/west)
"iEl" = (
/obj/machinery/light,
+/obj/machinery/phone,
+/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -51037,10 +51051,6 @@
pixel_y = 21
},
/obj/structure/table,
-/obj/item/phone{
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/plasteel{
icon_state = "bcircuit"
},
@@ -56753,10 +56763,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/item/paper_bin/nanotrasen,
-/obj/item/pen/multi/fountain,
/obj/structure/cable/orange{
icon_state = "1-2"
},
+/obj/item/paper/ntrep{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/pen/multi/fountain,
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"kvZ" = (
@@ -57025,6 +57039,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/item/book/manual/wiki/security_space_law,
/obj/item/gavelhammer,
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
@@ -58736,10 +58751,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/item/paper/ntrep,
/obj/structure/cable/orange{
icon_state = "1-8"
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"kQf" = (
@@ -96880,11 +96897,16 @@
"sZY" = (
/obj/structure/table/reinforced,
/obj/item/ashtray/bronze{
- pixel_y = 4
+ pixel_y = 0;
+ pixel_x = 7
},
/obj/item/reagent_containers/drinks/mug/qm{
- pixel_x = 2;
- pixel_y = 18
+ pixel_x = -8;
+ pixel_y = 10
+ },
+/obj/machinery/phone{
+ pixel_y = 12;
+ pixel_x = 9
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -99426,8 +99448,8 @@
},
/obj/item/ashtray/bronze,
/obj/item/reagent_containers/drinks/mug/cmo{
- pixel_y = 19;
- pixel_x = -5
+ pixel_y = 24;
+ pixel_x = 9
},
/obj/item/paper_bin/nanotrasen{
pixel_x = 7;
@@ -99445,6 +99467,10 @@
pixel_x = 6;
pixel_y = -15
},
+/obj/machinery/phone{
+ pixel_y = 11;
+ pixel_x = -5
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -110899,8 +110925,10 @@
/area/station/maintenance/security/aft_starboard)
"vWW" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/radio/phone,
/obj/structure/table/wood,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"vWX" = (
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 1a1059f651b..ed3f69ed2b8 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -3186,7 +3186,6 @@
/area/station/public/storage/emergency/port)
"arB" = (
/obj/structure/table/wood,
-/obj/item/phone,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel/grimy,
/area/station/public/vacant_office)
@@ -12262,14 +12261,22 @@
/area/station/supply/qm)
"aWH" = (
/obj/structure/table/reinforced,
-/obj/item/folder/yellow,
-/obj/item/stamp/qm,
+/obj/item/folder/yellow{
+ pixel_y = -8
+ },
+/obj/item/stamp/qm{
+ pixel_y = -8
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/phone{
+ pixel_y = 8;
+ pixel_x = 5
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -19011,15 +19018,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/nw)
-"byR" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/regular,
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/turf/simulated/floor/plasteel/dark,
-/area/station/command/bridge)
"byS" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -22650,7 +22648,6 @@
/area/station/command/meeting_room)
"bKL" = (
/obj/structure/table/wood,
-/obj/item/phone,
/obj/item/cigbutt/cigarbutt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24151,6 +24148,10 @@
pixel_x = -5;
req_access = list(56)
},
+/obj/machinery/phone{
+ pixel_y = 12;
+ pixel_x = -4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -24352,14 +24353,6 @@
},
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
-"bQO" = (
-/obj/structure/table/wood,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/item/flashlight/lamp/green,
-/turf/simulated/floor/carpet/black,
-/area/station/command/office/captain)
"bQP" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced{
@@ -27487,6 +27480,7 @@
pixel_x = -5;
pixel_y = 12
},
+/obj/item/stamp/rep,
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"cbY" = (
@@ -27877,7 +27871,9 @@
/area/station/command/office/ntrep)
"cdK" = (
/obj/structure/table/wood,
-/obj/item/stamp/rep,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"cdL" = (
@@ -28568,13 +28564,16 @@
/area/station/command/office/hop)
"chg" = (
/obj/structure/table/wood,
-/obj/item/folder/blue,
+/obj/item/paper_bin/nanotrasen,
+/obj/item/folder/blue{
+ pixel_y = 2;
+ pixel_x = 2
+ },
/obj/item/pen/multi,
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"chh" = (
/obj/structure/table/wood,
-/obj/item/paper_bin/nanotrasen,
/obj/machinery/door_control{
id = "hopofficedoor";
name = "Office Door";
@@ -28582,6 +28581,10 @@
pixel_x = -8;
req_access = list(57)
},
+/obj/machinery/phone{
+ pixel_y = 2;
+ pixel_x = 7
+ },
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"chi" = (
@@ -28731,6 +28734,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/item/megaphone,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -28754,6 +28758,7 @@
/obj/item/folder/red{
pixel_y = 3
},
+/obj/item/taperecorder,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -36761,7 +36766,7 @@
"cHe" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
-/obj/item/megaphone,
+/obj/item/storage/firstaid/regular,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
@@ -42991,6 +42996,10 @@
/obj/item/paper_bin/nanotrasen,
/obj/item/pen/multi,
/obj/effect/turf_decal/delivery/hollow,
+/obj/item/paicard{
+ pixel_y = -2;
+ pixel_x = 5
+ },
/turf/simulated/floor/plasteel/white,
/area/station/command/office/rd)
"dgt" = (
@@ -44243,10 +44252,9 @@
/obj/machinery/door_control{
id = "rdtest";
name = "Test Range Shutters";
- pixel_x = -4;
+ pixel_x = -6;
pixel_y = 6
},
-/obj/item/paicard,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -44256,10 +44264,14 @@
id = "rdofficedoor";
name = "Office Door";
normaldoorcontrol = 1;
- pixel_x = -4;
+ pixel_x = -6;
pixel_y = -4;
req_access = list(30)
},
+/obj/machinery/phone{
+ pixel_y = 2;
+ pixel_x = 8
+ },
/turf/simulated/floor/plasteel/white,
/area/station/command/office/rd)
"dmd" = (
@@ -54377,10 +54389,6 @@
pixel_x = 3;
pixel_y = 4
},
-/obj/item/phone{
- pixel_x = -4;
- pixel_y = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -54413,6 +54421,20 @@
icon_state = "red"
},
/area/station/security/permabrig)
+"foU" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/turf/simulated/floor/plasteel/dark,
+/area/station/command/bridge)
"foX" = (
/obj/item/radio/intercom{
name = "east bump";
@@ -54797,14 +54819,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"fAd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/security/execution)
"fAB" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -63183,6 +63197,10 @@
pixel_x = -7;
pixel_y = 6
},
+/obj/item/stamp/hos{
+ pixel_x = -7;
+ pixel_y = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -67034,7 +67052,6 @@
/area/station/service/bar)
"kUY" = (
/obj/structure/table/reinforced,
-/obj/item/phone,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
@@ -75974,9 +75991,9 @@
/obj/structure/table/wood,
/obj/machinery/light,
/obj/machinery/keycard_auth,
-/obj/item/stamp/hos{
- pixel_x = 12;
- pixel_y = 6
+/obj/machinery/phone{
+ pixel_y = 13;
+ pixel_x = 9
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -78525,8 +78542,9 @@
"pVP" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/item/megaphone,
-/obj/item/taperecorder,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/black,
/area/station/legal/magistrate)
"pVU" = (
@@ -79461,6 +79479,14 @@
icon_state = "caution"
},
/area/station/public/fitness)
+"quz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/security/execution)
"quL" = (
/obj/item/kirbyplants/large,
/obj/machinery/light,
@@ -79540,6 +79566,23 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/electrical)
+"qwU" = (
+/obj/structure/table/wood,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/item/flashlight/lamp/green{
+ pixel_x = -7
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/phone{
+ pixel_y = 1;
+ pixel_x = 10
+ },
+/turf/simulated/floor/carpet/black,
+/area/station/command/office/captain)
"qwZ" = (
/obj/structure/table/reinforced,
/obj/item/radio/intercom/department/security,
@@ -93413,6 +93456,10 @@
/obj/item/storage/box/monkeycubes{
pixel_x = -3
},
+/obj/machinery/phone{
+ pixel_y = 14;
+ pixel_x = 6
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -137210,7 +137257,7 @@ bKt
aaa
mBN
bxm
-byR
+foU
wGL
bCl
byU
@@ -140561,7 +140608,7 @@ bJk
bKZ
bLc
bLc
-bQO
+qwU
bSO
bUV
bWX
@@ -156473,7 +156520,7 @@ vyc
hof
tvQ
bdf
-fAd
+quz
oRB
aMv
aaa
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 7aa8c9efd8f..097aeaf9705 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -2988,6 +2988,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/item/storage/fancy/donut_box{
+ pixel_y = -14
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "blue"
@@ -5749,11 +5752,13 @@
/area/station/service/theatre)
"biX" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box,
/obj/machinery/ai_status_display{
pixel_x = -32;
step_size = 0
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "blue"
@@ -6111,6 +6116,10 @@
/obj/structure/table/wood,
/obj/item/paper_bin/nanotrasen,
/obj/item/pen/multi/gold,
+/obj/machinery/phone{
+ pixel_y = 9;
+ pixel_x = 14
+ },
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -10335,10 +10344,6 @@
/area/station/service/chapel/office)
"bZP" = (
/obj/structure/table/reinforced,
-/obj/item/phone{
- pixel_x = -3;
- pixel_y = 3
- },
/obj/machinery/ai_status_display{
pixel_y = 32
},
@@ -17287,6 +17292,9 @@
"dvd" = (
/obj/structure/table/wood,
/obj/structure/sign/poster/official/random/directional/south,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/grimey,
/area/station/command/office/hop)
"dvf" = (
@@ -22136,6 +22144,10 @@
/obj/item/stamp/captain{
pixel_y = 6
},
+/obj/machinery/phone{
+ pixel_y = 2;
+ pixel_x = 16
+ },
/turf/simulated/floor/carpet/royalblue,
/area/station/command/office/captain)
"evB" = (
@@ -30789,7 +30801,9 @@
/area/station/maintenance/aft)
"gdG" = (
/obj/structure/table/reinforced,
-/obj/item/megaphone,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
"gdS" = (
@@ -32831,7 +32845,9 @@
/area/station/maintenance/solar_maintenance/aft_starboard)
"gze" = (
/obj/structure/table/reinforced,
-/obj/item/cartridge/qm,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -49478,10 +49494,14 @@
"jMK" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
-/obj/item/pen/multi/fountain,
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/item/folder{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/obj/item/pen/multi/fountain,
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"jMN" = (
@@ -52985,9 +53005,9 @@
pixel_y = 15;
pixel_x = -5
},
-/obj/item/folder{
- pixel_x = 4;
- pixel_y = -3
+/obj/machinery/phone{
+ pixel_y = -7;
+ pixel_x = -4
},
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
@@ -53456,7 +53476,6 @@
/area/station/service/chapel/funeral)
"kDr" = (
/obj/structure/table/wood,
-/obj/item/phone,
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
"kDs" = (
@@ -68855,7 +68874,7 @@
/obj/item/stamp/cmo,
/obj/item/food/grown/apple{
pixel_y = 21;
- pixel_x = -11
+ pixel_x = -2
},
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
@@ -74241,10 +74260,6 @@
pixel_x = -4;
pixel_y = -4
},
-/obj/item/phone{
- pixel_x = -4;
- pixel_y = 4
- },
/obj/item/storage/fancy/cigarettes/cigpack_random{
pixel_x = 5;
pixel_y = 5
@@ -77089,11 +77104,11 @@
"pld" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/drinks/coffee{
- pixel_x = 8;
- pixel_y = 10
+ pixel_x = 13;
+ pixel_y = 13
},
-/obj/item/megaphone{
- pixel_x = -3
+/obj/machinery/phone{
+ pixel_y = 2
},
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
@@ -80183,7 +80198,6 @@
/area/station/engineering/transmission_laser)
"pSS" = (
/obj/structure/table/reinforced,
-/obj/item/phone,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/command/vault)
@@ -84972,6 +84986,9 @@
/obj/structure/table/glass,
/obj/item/clipboard,
/obj/item/folder/blue,
+/obj/item/megaphone{
+ pixel_x = -3
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -85456,7 +85473,6 @@
"qYF" = (
/obj/structure/table/glass/reinforced,
/obj/structure/window/reinforced,
-/obj/item/phone,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -96210,7 +96226,6 @@
/area/station/security/armory/secure)
"tbW" = (
/obj/structure/table,
-/obj/item/phone,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -108889,6 +108904,7 @@
"vCK" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/sop_engineering,
+/obj/item/megaphone,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellow"
@@ -109778,10 +109794,9 @@
/area/station/hallway/primary/central/ne)
"vLC" = (
/obj/structure/table/wood,
-/obj/item/clipboard{
- pixel_x = 5
+/obj/machinery/phone{
+ pixel_y = 2
},
-/obj/item/book/manual/wiki/sop_legal,
/turf/simulated/floor/carpet,
/area/station/command/office/hos)
"vLH" = (
@@ -116685,10 +116700,6 @@
/area/station/security/processing)
"xih" = (
/obj/structure/table,
-/obj/item/phone{
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -117677,10 +117688,18 @@
pixel_y = 6;
req_access = list(30)
},
+/obj/item/paper/monitorkey{
+ pixel_y = 2;
+ pixel_x = 7
+ },
/obj/item/reagent_containers/drinks/coffee{
pixel_x = 8;
pixel_y = 10
},
+/obj/item/stamp/rd{
+ pixel_x = 5;
+ pixel_y = -2
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkpurple"
@@ -120110,10 +120129,14 @@
/area/station/command/office/ce)
"xRM" = (
/obj/structure/table/wood,
-/obj/item/megaphone,
/obj/machinery/light{
dir = 4
},
+/obj/item/book/manual/wiki/sop_legal,
+/obj/item/clipboard{
+ pixel_x = 5
+ },
+/obj/item/megaphone,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -121615,13 +121638,22 @@
/obj/item/folder/white{
pixel_x = 4
},
-/obj/item/paper/monitorkey,
-/obj/item/stamp/rd{
- pixel_x = 5;
- pixel_y = -2
+/obj/item/paper_bin/nanotrasen{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/machinery/phone{
+ pixel_y = 2;
+ pixel_x = -9
+ },
+/obj/item/folder/white{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/pen/rd{
+ pixel_y = 5;
+ pixel_x = 6
},
-/obj/item/pen/rd,
-/obj/item/paper_bin/nanotrasen,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkpurple"
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 36a1ecd272e..799da2fbef6 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -9815,6 +9815,10 @@
},
/obj/item/clipboard,
/obj/item/paper/tcommskey,
+/obj/item/reagent_containers/patch/silver_sulf{
+ pixel_x = -4;
+ pixel_y = 0
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkyellowfull"
},
@@ -12461,10 +12465,6 @@
/area/station/supply/sorting)
"bpq" = (
/obj/structure/table/reinforced,
-/obj/item/phone{
- pixel_x = -3;
- pixel_y = 3
- },
/obj/item/cigbutt/cigarbutt,
/obj/item/radio/intercom/private{
pixel_x = 28
@@ -12990,7 +12990,6 @@
},
/area/station/security/permabrig)
"bsb" = (
-/obj/item/folder/white,
/obj/machinery/light{
dir = 8
},
@@ -12998,6 +12997,10 @@
icon_state = "1-2"
},
/obj/structure/table/glass,
+/obj/item/storage/firstaid/regular{
+ pixel_x = 3;
+ pixel_y = 3
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkgreen"
@@ -13017,6 +13020,7 @@
/obj/item/folder/red{
pixel_y = 3
},
+/obj/item/folder/white,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -13295,10 +13299,6 @@
},
/area/station/engineering/engine_foyer)
"btT" = (
-/obj/item/storage/firstaid/regular{
- pixel_x = 3;
- pixel_y = 3
- },
/obj/structure/table/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -13312,6 +13312,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkgreencorners"
@@ -13895,10 +13898,6 @@
/obj/machinery/computer/guestpass{
pixel_y = 30
},
-/obj/item/ashtray/glass{
- pixel_x = -10;
- pixel_y = -3
- },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"bvr" = (
@@ -18004,6 +18003,7 @@
/obj/item/stamp/denied{
pixel_y = 13
},
+/obj/item/ashtray/glass,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
pixel_x = 6;
pixel_y = -8
@@ -19963,18 +19963,14 @@
/area/station/command/office/ntrep)
"bWZ" = (
/obj/structure/table/wood,
-/obj/item/paper_bin/nanotrasen,
-/obj/item/clipboard{
- pixel_x = -2
- },
-/obj/item/folder,
-/obj/item/pen/multi/fountain,
-/obj/item/stamp/rep,
/obj/machinery/requests_console/directional/west,
/obj/machinery/keycard_auth{
pixel_x = -24;
pixel_y = -24
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"bXb" = (
@@ -21313,8 +21309,20 @@
"cdB" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
- pixel_x = -5;
- pixel_y = 1
+ pixel_x = -8;
+ pixel_y = 11
+ },
+/obj/item/clipboard{
+ pixel_x = 7;
+ pixel_y = 0
+ },
+/obj/item/folder{
+ pixel_y = 0;
+ pixel_x = 4
+ },
+/obj/item/pen/multi/fountain{
+ pixel_y = 0;
+ pixel_x = 5
},
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
@@ -21642,20 +21650,6 @@
icon_state = "darkred"
},
/area/station/command/bridge)
-"cfj" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/vault{
- pixel_y = 30
- },
-/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
- pixel_x = 7;
- pixel_y = 5
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/hop)
"cfm" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical,
@@ -21674,16 +21668,6 @@
icon_state = "darkbluefull"
},
/area/station/medical/surgery/primary)
-"cfn" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin/nanotrasen,
-/obj/structure/window/reinforced,
-/obj/item/pen/cap,
-/obj/item/stamp/captain{
- pixel_y = 13
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/captain)
"cfp" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -22572,15 +22556,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
-"ciK" = (
-/obj/structure/table/wood,
-/obj/item/paper/ntrep,
-/obj/item/ashtray/glass{
- pixel_x = 16;
- pixel_y = 2
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
"ciM" = (
/obj/structure/closet/crate,
/obj/item/stack/rods{
@@ -25363,7 +25338,11 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"cvJ" = (
-/obj/item/kirbyplants/large/alien/alien6,
+/obj/item/folder/white,
+/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
+ pixel_x = 5
+ },
+/obj/structure/table/glass/reinforced,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -25621,6 +25600,9 @@
/obj/item/circuitboard/aicore,
/obj/item/paicard,
/obj/item/aicard,
+/obj/item/taperecorder{
+ pixel_x = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -36861,9 +36843,10 @@
icon_state = "1-2"
},
/obj/item/ashtray/glass{
- pixel_x = -9;
+ pixel_x = 9;
pixel_y = 10
},
+/obj/item/stamp/captain,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"eIq" = (
@@ -37026,10 +37009,6 @@
/area/station/public/mrchangs)
"eLB" = (
/obj/structure/table,
-/obj/item/phone{
- pixel_x = 6;
- pixel_y = -2
- },
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"eLD" = (
@@ -39544,15 +39523,6 @@
/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"fFf" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/qm,
-/obj/item/ashtray/glass{
- pixel_y = 11
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/supply/qm)
"fFi" = (
/obj/structure/table,
/obj/item/wirecutters,
@@ -44358,6 +44328,9 @@
/obj/item/cartridge/signal/toxins{
pixel_y = 6
},
+/obj/item/toy/figure/crew/rd{
+ pixel_y = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -45566,6 +45539,7 @@
/obj/structure/closet/secure_closet/magistrate,
/obj/machinery/alarm/directional/north,
/obj/item/megaphone,
+/obj/item/taperecorder,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -49714,6 +49688,19 @@
icon_state = "browncorner"
},
/area/station/hallway/supply/port)
+"jtA" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/obj/structure/table/wood,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/hos)
"jtB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -50979,7 +50966,9 @@
/area/station/medical/surgery/observation)
"jNu" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/patch/silver_sulf,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkyellowfull"
},
@@ -51694,7 +51683,6 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"jXj" = (
-/obj/item/taperecorder,
/obj/structure/table/reinforced,
/obj/machinery/button/windowtint{
dir = 4;
@@ -51711,6 +51699,9 @@
pixel_y = -4;
req_access = list(74)
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
/turf/simulated/floor/carpet,
/area/station/legal/magistrate)
"jXo" = (
@@ -56252,18 +56243,6 @@
icon_state = "dark"
},
/area/station/engineering/equipmentstorage)
-"lCW" = (
-/obj/structure/table/glass/reinforced,
-/obj/item/ashtray/bronze{
- pixel_y = 11
- },
-/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
- pixel_x = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/command/office/rd)
"lDa" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -56990,22 +56969,6 @@
icon_state = "whiteyellow"
},
/area/station/medical/medbay)
-"lQi" = (
-/obj/effect/turf_decal/woodsiding{
- dir = 8
- },
-/obj/structure/table/wood,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
- pixel_x = 6;
- pixel_y = -8
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/hos)
"lQx" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -58410,6 +58373,17 @@
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
+"moW" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin/nanotrasen,
+/obj/structure/window/reinforced,
+/obj/machinery/phone{
+ pixel_y = 11;
+ pixel_x = 14
+ },
+/obj/item/pen/cap,
+/turf/simulated/floor/wood,
+/area/station/command/office/captain)
"mpr" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/beer{
@@ -62332,6 +62306,28 @@
icon_state = "darkgrey"
},
/area/station/maintenance/fore2)
+"nJr" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/pen{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/machinery/phone{
+ pixel_y = 2;
+ pixel_x = 15
+ },
+/obj/machinery/computer/security/telescreen/vault{
+ pixel_y = 30
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/hop)
"nJC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -64113,6 +64109,9 @@
/area/station/supply/storage)
"org" = (
/obj/effect/mapping_helpers/turfs/damage,
+/obj/structure/chair{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/station/supply/qm)
"orm" = (
@@ -64308,6 +64307,20 @@
"ovR" = (
/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
+"owa" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin/nanotrasen,
+/obj/item/paper/ntrep{
+ pixel_y = 2;
+ pixel_x = 2
+ },
+/obj/item/stamp/rep,
+/obj/item/ashtray/glass{
+ pixel_x = 16;
+ pixel_y = 2
+ },
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"owq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -64393,6 +64406,13 @@
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"oyF" = (
+/obj/structure/table/wood,
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/turf/simulated/floor/carpet/royalblack,
+/area/station/supply/qm)
"oyM" = (
/obj/machinery/light/small{
dir = 4
@@ -71897,10 +71917,8 @@
},
/area/station/science/storage)
"rhR" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/simulated/floor/wood,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/carpet/royalblack,
/area/station/supply/qm)
"rif" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -72260,7 +72278,9 @@
/area/station/medical/surgery/observation)
"rqk" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
/turf/simulated/floor/carpet/royalblack,
/area/station/supply/qm)
"rqq" = (
@@ -78541,9 +78561,8 @@
/area/station/service/library)
"tHP" = (
/obj/structure/table,
-/obj/item/taperecorder{
- pixel_x = 6;
- pixel_y = 10
+/obj/item/ashtray/bronze{
+ pixel_y = 11
},
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
@@ -80327,6 +80346,14 @@
/obj/item/ashtray/glass{
pixel_y = 11
},
+/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
+ pixel_x = 6;
+ pixel_y = -8
+ },
+/obj/item/cigbutt/cigarbutt{
+ pixel_x = 2;
+ pixel_y = 12
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hos)
"usD" = (
@@ -82436,10 +82463,6 @@
pixel_y = 28
},
/obj/structure/table/wood,
-/obj/item/phone{
- pixel_x = -3;
- pixel_y = 3
- },
/obj/item/cigbutt/cigarbutt{
pixel_x = 5;
pixel_y = -1
@@ -83936,6 +83959,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"vKr" = (
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/obj/structure/table/glass/reinforced,
+/obj/item/ashtray/bronze{
+ pixel_y = 11
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/command/office/rd)
"vKs" = (
/obj/machinery/camera{
c_tag = "Security - Firing Range";
@@ -88039,6 +88074,14 @@
/obj/machinery/light,
/obj/structure/table/wood,
/obj/item/paper_bin,
+/obj/item/paper{
+ pixel_y = 2;
+ pixel_x = 2
+ },
+/obj/item/pen/red{
+ pixel_x = 2;
+ pixel_y = 6
+ },
/turf/simulated/floor/wood,
/area/station/supply/qm)
"xid" = (
@@ -88782,6 +88825,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/machinery/phone{
+ pixel_y = 2
+ },
+/obj/structure/table/glass,
/turf/simulated/floor/carpet/blue,
/area/station/command/office/cmo)
"xwi" = (
@@ -110566,7 +110613,7 @@ aIF
bES
iCf
org
-rhR
+gGU
pHt
izt
xhZ
@@ -110823,7 +110870,7 @@ mVp
bES
ica
bND
-fFf
+oyF
mYZ
aiG
aiG
@@ -111080,7 +111127,7 @@ nZl
fYs
vxl
rqk
-kbw
+rhR
nKT
qac
kTF
@@ -114413,7 +114460,7 @@ aEQ
bsE
wum
bqc
-cfj
+nJr
btN
liK
byj
@@ -121355,7 +121402,7 @@ bqp
boI
buf
bwt
-cfn
+moW
blb
bCp
bEl
@@ -121563,7 +121610,7 @@ vHE
aUf
avc
kdl
-lQi
+jtA
usg
dHE
aXp
@@ -121882,7 +121929,7 @@ bQD
bSo
chF
bTU
-ciK
+owa
uMj
bZD
bZn
@@ -124987,7 +125034,7 @@ sBZ
hty
cmB
cGF
-lCW
+vKr
cCV
vUm
udI
diff --git a/code/__DEFINES/radio_defines.dm b/code/__DEFINES/radio_defines.dm
index bfe3f26259b..65f6438be35 100644
--- a/code/__DEFINES/radio_defines.dm
+++ b/code/__DEFINES/radio_defines.dm
@@ -19,6 +19,7 @@
#define DTH_FREQ 1341 //Special Operations
#define AI_FREQ 1343
#define ERT_FREQ 1345
+#define STARLINE_FREQ 1337 // Private starline
#define COMM_FREQ 1353 //Command
#define PROC_FREQ 1339 //Procedure
#define BOT_FREQ 1447 //mulebot, secbot, ed209
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 37bbc9e8862..8346dbc9b69 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -56,5 +56,7 @@ GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
GLOBAL_LIST_EMPTY(engine_beacon_list)
+GLOBAL_LIST_EMPTY(landline_phones)
+
/// List of wire colors for each object type of that round. One for airlocks, one for vendors, etc.
GLOBAL_LIST_EMPTY(wire_color_directory) // This is an associative list with the `holder_type` as the key, and a list of colors as the value.
diff --git a/code/controllers/subsystem/SSblackbox.dm b/code/controllers/subsystem/SSblackbox.dm
index b33de7d651e..7f24bc8d778 100644
--- a/code/controllers/subsystem/SSblackbox.dm
+++ b/code/controllers/subsystem/SSblackbox.dm
@@ -159,6 +159,8 @@ SUBSYSTEM_DEF(blackbox)
record_feedback("tally", "radio_usage", 1, "security")
if(DTH_FREQ)
record_feedback("tally", "radio_usage", 1, "deathsquad")
+ if(STARLINE_FREQ)
+ record_feedback("tally", "radio_usage", 1, "starline")
if(SYND_FREQ)
record_feedback("tally", "radio_usage", 1, "syndicate")
if(SYNDTEAM_FREQ)
diff --git a/code/controllers/subsystem/non_firing/SSradio.dm b/code/controllers/subsystem/non_firing/SSradio.dm
index e17bc1e42d1..671af3fce25 100644
--- a/code/controllers/subsystem/non_firing/SSradio.dm
+++ b/code/controllers/subsystem/non_firing/SSradio.dm
@@ -12,6 +12,7 @@ SUBSYSTEM_DEF(radio)
"Security" = SEC_FREQ,
"Response Team" = ERT_FREQ,
"Special Ops" = DTH_FREQ,
+ "Starline" = STARLINE_FREQ,
"Syndicate" = SYND_FREQ,
"SyndTeam" = SYNDTEAM_FREQ,
"Supply" = SUP_FREQ,
@@ -20,7 +21,7 @@ SUBSYSTEM_DEF(radio)
"Medical(I)" = MED_I_FREQ,
"Security(I)" = SEC_I_FREQ
)
- var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
+ var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ, STARLINE_FREQ)
var/list/ANTAG_FREQS = list(SYND_FREQ, SYNDTEAM_FREQ)
var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ, PROC_FREQ)
var/list/datum/radio_frequency/frequencies = list()
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 46dc2428770..488d2fb0e22 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -367,6 +367,19 @@
requires_tcomms = FALSE
instant = TRUE
+/obj/item/radio/headset/starline
+ name = "starline remote headset"
+ desc = "A headset that connects remotely to the starline hard line. Dont think about it too hard."
+ icon_state = "com_headset_alt"
+ worn_icon_state = "com_headset_alt"
+ requires_tcomms = FALSE
+ instant = TRUE
+ freqlock = TRUE
+
+/obj/item/radio/headset/starline/Initialize(mapload)
+ . = ..()
+ set_frequency(STARLINE_FREQ)
+
/// No need to care about icons, it should be hidden inside the AI anyway.
/obj/item/radio/headset/heads/ai_integrated
name = "\improper AI subspace transceiver"
diff --git a/code/game/objects/starline_phone.dm b/code/game/objects/starline_phone.dm
new file mode 100644
index 00000000000..3f089d9f978
--- /dev/null
+++ b/code/game/objects/starline_phone.dm
@@ -0,0 +1,189 @@
+#define NO_CALLS 1
+#define RINGING 2
+#define ACTIVE_CALL 3
+#define CALL_ENDED 4
+
+/obj/machinery/phone
+ name = "starline telephone"
+ desc = "A direct phone line for receiving calls from Central Command. It would be best for everyone if this never rang."
+ icon = 'icons/obj/starline_phone.dmi'
+ icon_state = "base"
+ anchored = TRUE
+ resistance_flags = ACID_PROOF | FIRE_PROOF | FREEZE_PROOF
+ power_state = NO_POWER_USE
+ pass_flags = PASSTABLE
+ /// Holds the handheld
+ var/obj/item/radio/phone_receiver/handheld
+ /// Is the handheld currently picked up
+ var/phone_state = NO_CALLS
+ /// Is this a centcomm telephone?
+ var/centcomm_phone = FALSE
+ /// what phone is this one conencted with
+ var/obj/machinery/phone/connected_line
+
+/obj/machinery/phone/centcomm
+ centcomm_phone = TRUE
+ name = "centcom master starline"
+
+/obj/machinery/phone/centcomm/attack_hand(mob/user)
+ var/mob/living/carbon/crew
+ if(ishuman(user))
+ crew = user
+ else
+ return // no stinky mobs/xenos allowed
+ if(phone_state != NO_CALLS)
+ to_chat(user, "There is already an ongoing call!")
+ return
+
+ var/list/available_phones = list()
+ for(var/obj/machinery/phone/phone in GLOB.landline_phones)
+ available_phones[get_area_name(phone)] = phone
+ var/phone_choice = tgui_input_list(user, "Select Destination Phone", "Phone:", available_phones)
+ if(!phone_choice)
+ return
+ var/obj/machinery/phone/target_phone = available_phones[phone_choice]
+ if(target_phone.phone_state != NO_CALLS)
+ to_chat(user, "Call attemp failed: Line busy.")
+ return
+ handheld = new
+ handheld.parent_phone = src
+ playsound(src, 'sound/machines/starline_pickup.ogg', 50, 0)
+ crew.put_in_active_hand(handheld)
+ icon_state = "answered"
+ phone_state = ACTIVE_CALL
+ connected_line = target_phone
+ connected_line.phone_state = RINGING
+ connected_line.connected_line = src
+ INVOKE_ASYNC(connected_line, PROC_REF(ring_loop))
+
+/obj/machinery/phone/Initialize(mapload)
+ . = ..()
+ if(!centcomm_phone) // we dont need to call CC phones
+ GLOB.landline_phones += src
+
+/obj/machinery/phone/attack_hand(mob/user)
+ var/mob/living/carbon/crew
+ if(ishuman(user))
+ crew = user
+ else
+ return // no stinky mobs/xenos allowed
+
+ switch(phone_state)
+ if(NO_CALLS)
+ to_chat(user, "There are no calls at the moment to pick up.")
+ return
+ if(RINGING)
+ handheld = new
+ handheld.parent_phone = src
+ playsound(src, 'sound/machines/starline_pickup.ogg', 50, 0)
+ crew.put_in_active_hand(handheld)
+ icon_state = "answered"
+ start_call()
+ else
+ to_chat(user, "The receiver is already off the dock!")
+ return
+
+/obj/machinery/phone/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/radio/phone_receiver))
+ if(phone_state == ACTIVE_CALL)
+ to_chat(user, "You hang up the call.")
+ end_call()
+ playsound(src, 'sound/machines/starline_hangup.ogg', 50, 0)
+ handheld.dropped()
+ icon_state = "base"
+ phone_state = NO_CALLS
+ return ITEM_INTERACT_COMPLETE
+
+/obj/machinery/phone/screwdriver_act(mob/living/user, obj/item/I)
+ return
+
+/obj/machinery/phone/crowbar_act(mob/living/user, obj/item/I)
+ return
+
+/obj/machinery/phone/wrench_act(mob/user, obj/item/I)
+ . = TRUE
+ if(!I.tool_use_check(user, 0))
+ return
+ default_unfasten_wrench(user, I)
+
+/obj/machinery/phone/proc/ring_loop()
+ var/ring_duration = 2 SECONDS
+ var/ring_rest_duration = 3 SECONDS
+ while(phone_state == RINGING)
+ playsound(src, 'sound/machines/starline_ring.ogg', 50, 0, 2, ignore_walls = TRUE)
+ icon_state = "ringing"
+ sleep(ring_duration)
+ icon_state = "base"
+ sleep(ring_rest_duration)
+
+/obj/machinery/phone/proc/start_call()
+ phone_state = ACTIVE_CALL
+ handheld.listening = TRUE
+ connected_line.handheld.listening = TRUE
+ connected_line.connected_line.audible_message("The receiver clicks as the other picks up.", hearing_distance = 1)
+
+/obj/machinery/phone/proc/end_call()
+ handheld.listening = FALSE
+ phone_state = NO_CALLS
+ if(connected_line)
+ connected_line.audible_message("The receiver clicks as the other line hangs up", hearing_distance = 1)
+ connected_line.connected_line = null
+ if(connected_line.phone_state == RINGING)
+ connected_line.phone_state = NO_CALLS
+ else
+ connected_line.phone_state = CALL_ENDED
+ connected_line.handheld.listening = FALSE
+ connected_line = null
+
+
+/obj/item/radio/phone_receiver
+ name = "phone receiver"
+ desc = "A device for speaking into and listening to a connected starlink phone. "
+ icon = 'icons/obj/starline_phone.dmi'
+ icon_state = "receiver"
+ flags = DROPDEL
+ /// the starline phone this receiver conencts to
+ var/obj/machinery/phone/parent_phone
+ pixel_x = 4
+
+/obj/item/radio/phone_receiver/Initialize(mapload)
+ . = ..()
+ on = TRUE
+ listening = FALSE
+ broadcasting = TRUE
+ loudspeaker = TRUE
+ set_frequency(STARLINE_FREQ)
+ requires_tcomms = FALSE
+ instant = TRUE
+ canhear_range = 0
+ freqlock = TRUE
+
+/obj/item/radio/phone_receiver/dropped(mob/user, silent)
+ visible_message("The receiver snaps back into its dock.")
+ parent_phone.icon_state = "base"
+ if(parent_phone.phone_state == ACTIVE_CALL)
+ parent_phone.end_call()
+ return ..()
+
+/obj/item/radio/phone_receiver/on_mob_move(dir, mob/user)
+ var/distance = get_dist(user.loc, parent_phone.loc)
+ if(distance > 2)
+ dropped()
+
+/obj/item/radio/phone_receiver/can_enter_storage(obj/item/storage/S, mob/user)
+ return FALSE
+
+// we dont want them touching things
+/obj/item/radio/phone_receiver/interact(mob/user)
+ return
+
+/obj/item/radio/phone_receiver/AltClick(mob/user)
+ return
+
+/obj/item/radio/phone_receiver/CtrlShiftClick(mob/user)
+ return
+
+#undef NO_CALLS
+#undef RINGING
+#undef ACTIVE_CALL
+#undef CALL_ENDED
diff --git a/icons/obj/starline_phone.dmi b/icons/obj/starline_phone.dmi
new file mode 100644
index 00000000000..61d4f76a23c
Binary files /dev/null and b/icons/obj/starline_phone.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 079e8879b48..10ac1fbc028 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1136,6 +1136,7 @@
#include "code\game\objects\obj_defense.dm"
#include "code\game\objects\obj_vv.dm"
#include "code\game\objects\objs.dm"
+#include "code\game\objects\starline_phone.dm"
#include "code\game\objects\structures.dm"
#include "code\game\objects\effects\alien_acid.dm"
#include "code\game\objects\effects\anomalies.dm"
diff --git a/sound/Attributions.txt b/sound/Attributions.txt
index d52102ac2f3..439c52155e1 100644
--- a/sound/Attributions.txt
+++ b/sound/Attributions.txt
@@ -17,3 +17,5 @@ Angry Pig Oinking by Jofae (full version of above for sound/creatures/pig.ogg)--
Moo 3 - Moo Moo the Cow by manofham (sound/creatures/cow.ogg)-- https://freesound.org/s/700380/ -- License: Creative Commons 0
effects/voxfcaw.ogg and effects/voxrcaw.ogg are processed versions of https://opengameart.org/content/crow-caw from zeroisnotnull under CC0 1.0
+
+starline_pickup was spliced from Phone Receiver.mp3 at https://freesound.org/people/Percy%20Duke/sounds/23535/ under Attributions CC 3.0
diff --git a/sound/machines/starline_hangup.ogg b/sound/machines/starline_hangup.ogg
new file mode 100644
index 00000000000..5175540c9c1
Binary files /dev/null and b/sound/machines/starline_hangup.ogg differ
diff --git a/sound/machines/starline_pickup.ogg b/sound/machines/starline_pickup.ogg
new file mode 100644
index 00000000000..0509b016a68
Binary files /dev/null and b/sound/machines/starline_pickup.ogg differ
diff --git a/sound/machines/starline_ring.ogg b/sound/machines/starline_ring.ogg
new file mode 100644
index 00000000000..f5bf4becf8a
Binary files /dev/null and b/sound/machines/starline_ring.ogg differ