diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 86da42206e98..3af8f42b582b 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -92,6 +92,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/briefcase,
+/obj/item/folder,
/obj/item/taperecorder{
pixel_x = -4;
pixel_y = 4
@@ -3823,8 +3824,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/folder,
+/obj/machinery/fax/deluxe/starts_enabled,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"arL" = (
@@ -4699,12 +4699,16 @@
/area/station/maintenance/starboard/aft)
"avU" = (
/obj/structure/table/wood,
+/obj/item/clipboard{
+ pixel_y = 4;
+ pixel_x = -4
+ },
/obj/item/paper_bin,
-/obj/item/pen,
/obj/item/pen/red{
pixel_x = 5;
pixel_y = 1
},
+/obj/item/pen,
/turf/open/floor/iron,
/area/station/security/courtroom)
"awb" = (
@@ -29361,10 +29365,7 @@
/obj/structure/table,
/obj/effect/turf_decal/bot,
/obj/structure/mirror/directional/north,
-/obj/machinery/fax{
- fax_name = "Law Office";
- name = "Law Office Fax Machine"
- },
+/obj/machinery/fax/deluxe/starts_enabled,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
"els" = (
@@ -42498,7 +42499,7 @@
"iSf" = (
/obj/structure/table/wood,
/obj/machinery/firealarm/directional/north,
-/obj/structure/statue/bronze/marx,
+/obj/machinery/fax,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"iSk" = (
diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm
index f8758a5eab3a..6bf927b1d948 100644
--- a/_maps/map_files/LimaStation/LimaStation.dmm
+++ b/_maps/map_files/LimaStation/LimaStation.dmm
@@ -204,6 +204,7 @@
"agd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/trash/garbage,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
"agp" = (
@@ -281,6 +282,9 @@
},
/obj/structure/table/reinforced/rglass,
/obj/item/storage/box/beakers,
+/obj/item/book/manual/wiki/infections{
+ pixel_y = 2
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"aic" = (
@@ -342,7 +346,6 @@
"aix" = (
/obj/structure/table/reinforced,
/obj/item/rcl/pre_loaded,
-/obj/item/reagent_containers/pill/patch/aiuri,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"aiO" = (
@@ -576,6 +579,13 @@
"amE" = (
/turf/closed/wall,
/area/station/service/chapel/funeral)
+"amL" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/upper)
"amM" = (
/obj/machinery/light/directional/west,
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
@@ -945,6 +955,10 @@
/obj/structure/extinguisher_cabinet/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/easel,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/nineteen_nineteen,
/turf/open/floor/wood,
/area/station/service/library)
"arV" = (
@@ -1691,6 +1705,11 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/item/storage/box/seccarts{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/storage/box/deputy,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
"aHf" = (
@@ -1808,7 +1827,8 @@
/area/station/engineering/main)
"aJY" = (
/obj/structure/table/wood,
-/obj/item/clothing/glasses/sunglasses,
+/obj/item/paper_bin,
+/obj/item/pen,
/turf/open/floor/carpet/orange,
/area/station/security/detectives_office)
"aKd" = (
@@ -1852,6 +1872,11 @@
/obj/effect/landmark/start/chaplain,
/turf/open/floor/carpet/red,
/area/station/service/chapel/funeral)
+"aKF" = (
+/obj/effect/turf_decal/tile/dark_red/diagonal_centre,
+/obj/effect/turf_decal/tile/dark_red/diagonal_centre,
+/turf/open/floor/iron/dark/diagonal,
+/area/station/service/chapel/office)
"aKK" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
@@ -2019,6 +2044,11 @@
},
/turf/open/floor/iron/sepia,
/area/station/service/library)
+"aOL" = (
+/obj/structure/closet,
+/obj/effect/spawner/random/mod/maint,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"aOR" = (
/obj/machinery/door/poddoor/preopen{
id = "xenobio1";
@@ -2382,6 +2412,11 @@
/area/station/security/courtroom)
"aWq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/structure/table_fancy,
+/obj/item/flashlight/lamp/green{
+ pixel_y = 4;
+ pixel_x = -4
+ },
/turf/open/floor/carpet,
/area/station/medical/psychology)
"aWs" = (
@@ -3136,11 +3171,11 @@
/turf/open/floor/iron,
/area/station/cargo/office)
"biW" = (
-/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/structure/cable,
+/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bjc" = (
@@ -3188,11 +3223,11 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"bkc" = (
-/obj/structure/filingcabinet,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/machinery/photocopier,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"bkm" = (
@@ -3313,12 +3348,12 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"blU" = (
-/obj/machinery/keycard_auth{
- pixel_x = 24
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
/obj/effect/turf_decal/siding/yellow{
dir = 1
},
@@ -3501,17 +3536,7 @@
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
"boR" = (
-/obj/item/storage/box/syringes,
-/obj/item/storage/box/syringes,
/obj/structure/disposalpipe/segment,
-/obj/item/reagent_containers/chem_pack{
- pixel_x = 10;
- pixel_y = 10
- },
-/obj/item/reagent_containers/chem_pack{
- pixel_x = 10;
- pixel_y = 10
- },
/obj/item/storage/box/beakers{
pixel_x = -5;
pixel_y = 5
@@ -3524,7 +3549,16 @@
dir = 8
},
/obj/structure/table/reinforced/rglass,
-/obj/machinery/light/directional/west,
+/obj/structure/item_dispenser/latex{
+ pixel_x = -31
+ },
+/obj/item/storage/box/rxglasses,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/camera{
+ c_tag = "Medbay - Storage";
+ dir = 8;
+ network = list("ss13","medbay")
+ },
/turf/open/floor/iron/white,
/area/station/medical/storage)
"boS" = (
@@ -3628,28 +3662,11 @@
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/engine/atmos)
"brr" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/storage/medkit/regular,
-/obj/item/storage/medkit/regular,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/item/storage/medkit/regular{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/item/storage/medkit/regular{
- pixel_x = 4;
- pixel_y = -2
- },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/rnd/production/techfab/department/medical,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/directional/east,
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"bry" = (
@@ -4599,10 +4616,6 @@
dir = 8
},
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera{
- c_tag = "Command - Aft Bridge";
- dir = 5
- },
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"bJv" = (
@@ -4618,7 +4631,6 @@
dir = 6
},
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"bJI" = (
@@ -4643,7 +4655,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/machinery/status_display/ai/directional/east,
+/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
"bKc" = (
@@ -4718,15 +4730,6 @@
/obj/structure/cable/layer1,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/computer)
-"bLN" = (
-/obj/structure/table/wood,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/fax_machine/recieving_disabled,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"bLV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -5010,6 +5013,10 @@
/obj/effect/turf_decal/siding/blue{
dir = 6
},
+/obj/item/storage/secure/briefcase{
+ pixel_y = 5;
+ pixel_x = 3
+ },
/obj/item/storage/medkit/regular,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/iron,
@@ -5227,6 +5234,17 @@
/obj/machinery/microwave,
/turf/open/floor/carpet/black,
/area/station/maintenance/starboard/aft)
+"bWj" = (
+/obj/machinery/door/morgue{
+ req_access = list("chapel_office");
+ name = "Relic Closet";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/sepia,
+/area/station/service/chapel/office)
"bWu" = (
/obj/structure/cable,
/turf/open/floor/plating,
@@ -5313,6 +5331,14 @@
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"bYB" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/sign/calendar/directional/north,
+/turf/open/floor/iron/dark/smooth_edge,
+/area/station/hallway/secondary/service)
"bYF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/closed/wall/r_wall,
@@ -5899,6 +5925,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
+/obj/structure/mirror/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/patients_rooms)
"clD" = (
@@ -6828,9 +6855,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/firealarm/directional/west,
-/obj/machinery/light_switch/directional/west{
- pixel_x = -38
- },
/turf/open/floor/iron/showroomfloor,
/area/station/science/explab)
"cBe" = (
@@ -6853,9 +6877,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
},
-/obj/machinery/light_switch/directional/south{
- pixel_x = -5
- },
+/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"cCj" = (
@@ -7030,11 +7052,7 @@
/area/station/service/janitor)
"cES" = (
/obj/structure/table/wood,
-/obj/item/storage/crayons,
-/obj/item/toy/crayon/spraycan,
-/obj/item/toy/crayon/spraycan{
- pixel_x = -4
- },
+/obj/machinery/fax,
/turf/open/floor/wood,
/area/station/service/library)
"cEY" = (
@@ -7195,6 +7213,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/fore)
+"cHY" = (
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/suit_storage_unit/ce,
+/obj/effect/turf_decal/bot_red,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"cIf" = (
/turf/open/floor/engine,
/area/station/science/explab)
@@ -7632,11 +7657,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
-"cSp" = (
-/obj/structure/table/wood,
-/obj/machinery/fax_machine,
-/turf/open/floor/carpet/royalblack,
-/area/station/security/detectives_office/bridge_officer_office)
"cSu" = (
/obj/structure/railing/corner,
/obj/structure/cable,
@@ -8744,7 +8764,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/item/storage/secure/briefcase,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"dlq" = (
@@ -8880,6 +8900,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
+/obj/structure/sink/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"doc" = (
@@ -8926,10 +8947,14 @@
/turf/open/floor/engine,
/area/station/engineering/atmos)
"dpb" = (
-/obj/structure/chair/office/light,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8
+ },
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
"dpc" = (
@@ -9392,10 +9417,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/range)
-"dya" = (
-/obj/structure/sign/warning/radiation,
-/turf/closed/wall/r_wall,
-/area/station/engineering/main)
"dyi" = (
/turf/open/floor/iron,
/area/station/cargo/miningdock)
@@ -9466,6 +9487,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light_switch/directional/north{
+ pixel_x = -8
+ },
/turf/open/floor/iron,
/area/station/engineering/main)
"dyW" = (
@@ -9606,11 +9630,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/vault,
/area/station/ai_monitored/command/nuke_storage)
-"dBo" = (
-/obj/structure/closet,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
"dBt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -9646,7 +9665,9 @@
/turf/open/floor/iron,
/area/station/hallway/primary/port)
"dCh" = (
-/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
/turf/open/floor/iron/dark/smooth_edge,
/area/station/command/heads_quarters/ce)
"dCj" = (
@@ -9672,6 +9693,8 @@
/area/station/medical/medbay/lobby)
"dCL" = (
/obj/structure/displaycase/labcage,
+/obj/effect/turf_decal/bot_red,
+/obj/effect/turf_decal/bot_red,
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"dDd" = (
@@ -9850,6 +9873,7 @@
/area/station/medical/medbay/lobby)
"dGV" = (
/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/plating,
/area/station/maintenance/port)
"dHa" = (
@@ -10158,11 +10182,10 @@
/area/station/maintenance/department/engine/atmos)
"dMs" = (
/obj/structure/cable,
-/obj/machinery/light_switch{
- pixel_x = 22;
- pixel_y = 11
- },
/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark/corner{
dir = 1
},
@@ -10503,11 +10526,8 @@
"dTe" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/rack,
-/obj/item/storage/box/lights/mixed,
-/obj/item/lightreplacer{
- pixel_y = 7
- },
+/obj/machinery/vending/wardrobe/engi_wardrobe,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"dTk" = (
@@ -10942,6 +10962,11 @@
/obj/item/storage/toolbox/emergency,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"eee" = (
+/obj/structure/table/wood,
+/obj/machinery/fax,
+/turf/open/floor/carpet/red,
+/area/station/service/chapel/office)
"eei" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/cargo)
@@ -11498,7 +11523,6 @@
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"epH" = (
-/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
@@ -12072,16 +12096,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"ezs" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/upper)
"ezA" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -12258,7 +12272,11 @@
/area/station/engineering/main)
"eCF" = (
/obj/structure/table/wood,
-/obj/item/hand_tele,
+/obj/item/storage/lockbox/medal,
+/obj/item/hand_tele{
+ pixel_y = 15;
+ pixel_x = 4
+ },
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain)
"eCP" = (
@@ -12855,7 +12873,7 @@
codes_txt = "delivery;dir=1";
location = "Security"
},
-/turf/open/floor/plating,
+/turf/open/floor/iron,
/area/station/maintenance/port)
"eMG" = (
/obj/effect/turf_decal/trimline/green/filled/line,
@@ -13761,7 +13779,7 @@
/area/station/command/heads_quarters/ce)
"fcy" = (
/obj/structure/table/reinforced,
-/obj/machinery/recharger,
+/obj/machinery/fax,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"fcB" = (
@@ -13789,6 +13807,7 @@
/obj/machinery/light/directional/south,
/obj/structure/table/reinforced,
/obj/item/paper_bin,
+/obj/item/pen,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"fcJ" = (
@@ -13905,8 +13924,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
+/obj/structure/closet/secure_closet/psychology,
/turf/open/floor/wood,
/area/station/medical/psychology)
"fex" = (
@@ -14297,10 +14315,8 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/machinery/computer/records/medical/laptop{
- dir = 8
- },
/obj/structure/sign/poster/official/random/directional/east,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"flG" = (
@@ -14811,7 +14827,6 @@
/turf/open/space/openspace,
/area/space)
"ful" = (
-/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/iron/sepia,
/area/station/service/chapel/office)
"fun" = (
@@ -15036,15 +15051,12 @@
/area/station/maintenance/department/science)
"fAC" = (
/obj/machinery/light/directional/west,
-/obj/structure/closet/crate{
- name = "DIY Canister Kit"
- },
-/obj/item/stack/sheet/plasteel{
- amount = 25
- },
-/obj/item/stack/sheet/iron/fifty,
/obj/machinery/firealarm/directional/west,
/obj/machinery/status_display/evac/directional/south,
+/obj/structure/closet,
+/obj/item/t_scanner,
+/obj/item/analyzer,
+/obj/item/book/manual/wiki/atmospherics,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/atmos/control_center)
"fAD" = (
@@ -15487,11 +15499,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/cryo)
-"fIW" = (
-/obj/structure/cable,
-/obj/structure/closet/radiation,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"fIX" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 8
@@ -15802,10 +15809,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"fOY" = (
-/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron,
-/area/station/medical/storage)
"fPa" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Office"
@@ -16660,10 +16663,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"ggV" = (
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/sepia,
-/area/station/service/chapel/office)
"ghd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -17292,24 +17291,9 @@
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
"gsV" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 8
},
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced/rglass,
-/obj/item/storage/medkit/toxin,
-/obj/item/storage/medkit/toxin{
- pixel_x = 4;
- pixel_y = -2
- },
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"gsX" = (
@@ -17344,6 +17328,7 @@
dir = 6
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
+/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"gtL" = (
@@ -18134,6 +18119,9 @@
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
+/obj/item/clipboard,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
/turf/open/floor/iron/dark/smooth_edge,
/area/station/hallway/secondary/service)
"gHC" = (
@@ -18234,8 +18222,8 @@
/area/station/security/brig)
"gJN" = (
/obj/structure/table/wood,
-/obj/item/storage/lockbox/medal,
/obj/item/radio/intercom/directional/south,
+/obj/machinery/fax,
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain)
"gKc" = (
@@ -19085,6 +19073,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"gXd" = (
@@ -19180,11 +19169,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/security/prison/safe)
-"gYs" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
"gYt" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
@@ -19496,9 +19480,7 @@
/obj/machinery/button/door/directional/east{
id = "commissaryshutter";
name = "Commissary Shutters";
- normaldoorcontrol = 1;
- pixel_y = 6;
- specialfunctions = 4
+ pixel_y = 6
},
/obj/machinery/button/door/directional/east{
id = "commissarydoor";
@@ -19580,11 +19562,8 @@
/area/station/maintenance/starboard/lower)
"hhb" = (
/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
/obj/machinery/airalarm/directional/north,
+/obj/machinery/fax,
/turf/open/floor/iron/showroomfloor,
/area/station/tcommsat/computer)
"hhd" = (
@@ -19950,6 +19929,7 @@
"hob" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
+/obj/item/kirbyplants/dead/research_director,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
"hoj" = (
@@ -20209,11 +20189,13 @@
/area/station/engineering/atmos)
"htE" = (
/obj/machinery/newscaster/directional/west,
-/obj/structure/easel,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/twentythree_nineteen,
-/obj/item/canvas/twentythree_twentythree,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/table/wood,
+/obj/item/storage/crayons,
+/obj/item/toy/crayon/spraycan,
+/obj/item/toy/crayon/spraycan{
+ pixel_x = -4
+ },
/turf/open/floor/wood,
/area/station/service/library)
"htK" = (
@@ -20222,6 +20204,13 @@
/obj/effect/turf_decal/bot/right,
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
+"htL" = (
+/obj/effect/landmark/start/medical_doctor,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/storage)
"htM" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -20668,13 +20657,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/coldroom)
-"hCx" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/upper)
"hCy" = (
/obj/structure/table/glass,
/obj/effect/spawner/random/trash/food_packaging,
@@ -20743,6 +20725,9 @@
/obj/structure/table/wood,
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/east,
+/obj/machinery/fax{
+ pixel_y = 2
+ },
/turf/open/floor/carpet/orange,
/area/station/security/detectives_office)
"hDu" = (
@@ -20991,10 +20976,13 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"hIe" = (
-/obj/structure/closet/secure_closet/psychology,
/obj/machinery/light_switch/directional/west,
/obj/structure/extinguisher_cabinet/directional/south,
/obj/machinery/light/small/directional/south,
+/obj/machinery/fax{
+ pixel_y = 2
+ },
+/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/medical/psychology)
"hIq" = (
@@ -21169,7 +21157,13 @@
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
"hKI" = (
-/obj/item/kirbyplants/random,
+/obj/structure/rack,
+/obj/item/aicard,
+/obj/item/circuitboard/aicore{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
"hKK" = (
@@ -21629,21 +21623,16 @@
/area/station/engineering/atmos)
"hSC" = (
/obj/machinery/light/directional/south,
-/obj/machinery/button/door{
- id = "SupermatterExternal";
- name = "Shutters Control";
- pixel_y = -24
- },
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 3
},
-/obj/machinery/firealarm/directional/south,
/obj/item/radio/off{
pixel_x = 6
},
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
+/obj/structure/sign/warning/radiation/directional/south,
/turf/open/floor/iron/dark/smooth_corner,
/area/station/engineering/main)
"hSR" = (
@@ -21950,18 +21939,13 @@
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
"hZv" = (
-/obj/item/reagent_containers/cup/glass/bottle/holywater{
- pixel_y = 4;
- pixel_x = 1
- },
-/obj/item/nullrod{
- pixel_x = 16;
- pixel_y = 3
- },
/obj/structure/table/wood,
/obj/machinery/light_switch/directional/north{
pixel_x = -6
},
+/obj/item/storage/crayons{
+ pixel_x = 6
+ },
/turf/open/floor/carpet/red,
/area/station/service/chapel/office)
"hZB" = (
@@ -22291,10 +22275,6 @@
dir = 4
},
/obj/structure/cable,
-/obj/machinery/light_switch{
- pixel_x = -10;
- pixel_y = 22
- },
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22469,10 +22449,11 @@
/area/station/hallway/primary/central)
"iiL" = (
/obj/item/kirbyplants/random,
-/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
+/obj/machinery/airalarm/directional/west,
+/obj/structure/sign/clock/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
"iiO" = (
@@ -22792,6 +22773,12 @@
/obj/item/book/manual/wiki/engineering_construction,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"ipQ" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/blobstart,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/experiment_room)
"ipU" = (
/obj/item/kirbyplants/random,
/turf/open/floor/plating,
@@ -23165,13 +23152,6 @@
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/box,
/obj/structure/disposalpipe/trunk,
-/obj/machinery/camera{
- c_tag = "Medbay - Storage";
- dir = 8;
- network = list("ss13","medbay")
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"iwm" = (
@@ -23454,7 +23434,10 @@
/area/station/hallway/secondary/entry)
"iCd" = (
/obj/structure/rack,
-/obj/item/book/manual/wiki/tcomms,
+/obj/item/book/manual/wiki/tcomms{
+ pixel_y = 2;
+ pixel_x = 3
+ },
/obj/item/radio/off,
/obj/item/multitool,
/obj/machinery/newscaster/directional/south,
@@ -24402,7 +24385,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/machinery/status_display/ai/directional/south,
+/obj/structure/sign/warning/fire/directional/south,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
"iRT" = (
@@ -24876,7 +24859,9 @@
/area/station/maintenance/port/lower)
"jbS" = (
/obj/structure/table/wood,
-/obj/item/storage/crayons,
+/obj/item/storage/box/actionfigure{
+ pixel_y = 4
+ },
/turf/open/floor/wood,
/area/station/service/library)
"jda" = (
@@ -24917,9 +24902,8 @@
"jec" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 10
+ dir = 8
},
-/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"jem" = (
@@ -25572,15 +25556,11 @@
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
"jsE" = (
-/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 10
},
-/obj/item/experi_scanner{
- pixel_y = 5;
- pixel_x = 4
- },
-/obj/item/experi_scanner,
+/obj/structure/table,
+/obj/machinery/fax,
/turf/open/floor/iron/showroomfloor,
/area/station/science/lab)
"jsV" = (
@@ -25636,7 +25616,11 @@
/turf/open/floor/grass,
/area/station/security/prison/garden)
"jtY" = (
-/turf/open/floor/iron/white,
+/obj/machinery/holopad,
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron,
/area/station/medical/storage)
"juf" = (
/turf/open/floor/iron/smooth_corner{
@@ -26510,13 +26494,6 @@
/area/station/engineering/atmos)
"jJA" = (
/obj/structure/disposalpipe/segment,
-/obj/item/storage/box/gloves,
-/obj/item/storage/box/rxglasses{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/reagent_containers/spray/cleaner,
-/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/newscaster/directional/west,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
@@ -26552,6 +26529,10 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
+/obj/machinery/camera{
+ c_tag = "Command - Aft Bridge";
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"jKf" = (
@@ -26941,6 +26922,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"jRe" = (
+/obj/structure/table/wood,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/fax/deluxe,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"jRs" = (
/obj/machinery/button/door{
id = "Dorm3";
@@ -28057,6 +28047,7 @@
c_tag = "Dormitory - Entrance";
dir = 5
},
+/obj/structure/sign/calendar/directional/south,
/turf/open/floor/iron,
/area/station/commons/dorms)
"kiy" = (
@@ -28156,10 +28147,13 @@
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai)
"kkk" = (
-/obj/structure/reagent_dispensers/plumbed,
+/obj/structure/reagent_dispensers/plumbed{
+ dir = 4
+ },
/obj/effect/turf_decal/delivery/white{
color = "#52B4E9"
},
+/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port)
"kkm" = (
@@ -29081,6 +29075,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
+"kzk" = (
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/smooth,
+/area/station/engineering/main)
"kzn" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/trimline/brown/filled/line,
@@ -29171,6 +29170,13 @@
/obj/structure/cable,
/turf/open/floor/iron/sepia,
/area/station/hallway/secondary/service)
+"kCg" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"kCj" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
@@ -29297,21 +29303,14 @@
/obj/item/storage/belt/medical{
pixel_y = 2
},
-/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/gloves/latex/nitrile,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/vending/wallmed/directional/north,
+/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/neck/stethoscope,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"kEQ" = (
@@ -29481,11 +29480,11 @@
/turf/open/floor/plating,
/area/station/engineering/supermatter)
"kHN" = (
-/obj/structure/plasticflaps/opaque,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
location = "Engineering"
},
+/obj/structure/plasticflaps/opaque,
/turf/open/floor/iron,
/area/station/maintenance/port)
"kHS" = (
@@ -29659,18 +29658,13 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"kLe" = (
-/obj/structure/rack,
-/obj/item/aicard,
-/obj/item/circuitboard/aicore{
- pixel_x = -2;
- pixel_y = 4
- },
/obj/machinery/light/directional/south,
/obj/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/siding/purple{
dir = 1
},
+/obj/structure/table,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
"kLf" = (
@@ -30490,10 +30484,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock)
-"kZi" = (
-/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron,
-/area/station/medical/storage)
"kZq" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -30607,6 +30597,9 @@
"laL" = (
/obj/machinery/duct,
/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"lbr" = (
@@ -31360,6 +31353,15 @@
dir = 4
},
/area/station/science/ordnance)
+"lmR" = (
+/obj/structure/reagent_dispensers/plumbed{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#52B4E9"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"lmT" = (
/obj/machinery/requests_console{
department = "Engineering";
@@ -31548,20 +31550,9 @@
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"lpf" = (
-/obj/machinery/vending/wardrobe/medi_wardrobe,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
},
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/directional/east,
-/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"lpr" = (
@@ -32006,17 +31997,22 @@
/turf/open/floor/iron/showroomfloor,
/area/station/command/heads_quarters/rd)
"lwX" = (
-/obj/structure/closet/crate/medical,
-/obj/item/storage/pill_bottle/happy{
- pixel_x = 2;
- pixel_y = 3
+/obj/structure/table/reinforced/rglass,
+/obj/item/storage/medkit/regular{
+ pixel_y = 3;
+ pixel_x = 4
},
-/obj/item/storage/pill_bottle/happinesspsych{
- pixel_x = -4;
- name = "suspicious pill bottle";
- desc = "There is a smiley on the top."
+/obj/item/storage/medkit/o2{
+ pixel_x = 1;
+ pixel_y = 1
},
-/turf/open/floor/plating,
+/obj/item/storage/medkit/o2{
+ pixel_x = 4;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/iron/dark,
/area/station/medical/storage)
"lxa" = (
/obj/structure/cable,
@@ -32388,25 +32384,11 @@
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
"lDk" = (
-/obj/structure/closet/secure_closet/medical3,
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/gloves/latex,
-/obj/item/clothing/gloves/latex/nitrile,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/status_display/evac/directional/north,
-/obj/item/clothing/neck/stethoscope,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/light/directional/north,
+/obj/machinery/suit_storage_unit/medical,
+/obj/effect/turf_decal/bot_red,
+/obj/structure/sign/clock/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"lEn" = (
@@ -32538,6 +32520,7 @@
/obj/machinery/microwave{
pixel_y = 4
},
+/obj/structure/sign/clock/directional/south,
/turf/open/floor/iron/sepia,
/area/station/hallway/secondary/service)
"lFY" = (
@@ -33083,19 +33066,15 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen/abandoned)
"lOH" = (
-/obj/machinery/suit_storage_unit/ce,
/obj/machinery/status_display/evac/directional/north,
/obj/effect/turf_decal/tile/neutral/full,
-/obj/effect/turf_decal/bot_red,
+/obj/structure/table/reinforced,
+/obj/machinery/fax,
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/ce)
"lOT" = (
-/obj/structure/table,
/obj/machinery/light/directional/east,
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 5;
- pixel_y = -1
- },
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -33107,6 +33086,21 @@
dir = 8
},
/obj/structure/cable,
+/obj/machinery/keycard_auth{
+ pixel_y = 3;
+ pixel_x = -1
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "bridge blast";
+ name = "Bridge Shutters Control";
+ pixel_x = 27;
+ pixel_y = -6
+ },
+/obj/machinery/light_switch/directional/east{
+ pixel_x = 27;
+ pixel_y = 6
+ },
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"lOV" = (
@@ -33404,14 +33398,6 @@
/obj/effect/spawner/costume/mafia,
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
-"lVf" = (
-/obj/structure/reagent_dispensers/plumbed,
-/obj/effect/turf_decal/delivery/white{
- color = "#52B4E9"
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
"lVq" = (
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -33769,6 +33755,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"mcl" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/structure/table,
+/obj/machinery/fax/deluxe,
+/turf/open/floor/iron,
+/area/station/maintenance/department/cargo)
"mcm" = (
/obj/structure/cable,
/obj/structure/sign/warning/electric_shock/directional/east,
@@ -34676,7 +34670,6 @@
/obj/machinery/computer/records/security{
dir = 4
},
-/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
@@ -34792,6 +34785,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
+/obj/structure/mirror/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/patients_rooms)
"mux" = (
@@ -34863,28 +34857,9 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"mvD" = (
-/obj/structure/table/reinforced/rglass,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/gun/syringe,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vending/medical,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"mvS" = (
@@ -35170,7 +35145,8 @@
/area/station/engineering/main)
"mAV" = (
/obj/machinery/door/morgue{
- name = "Confession Booth"
+ name = "Confession Booth";
+ dir = 4
},
/turf/open/floor/iron/sepia,
/area/station/service/chapel)
@@ -35662,24 +35638,19 @@
/area/station/maintenance/port/lower)
"mMb" = (
/obj/structure/table/reinforced/rglass,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/storage/medkit/regular{
+ pixel_y = 2;
+ pixel_x = 4
},
-/obj/effect/turf_decal/tile/blue,
/obj/item/storage/medkit/fire,
/obj/item/storage/medkit/fire{
pixel_y = -3;
pixel_x = 5
},
-/obj/machinery/door/window/left/directional/north{
- name = "First-Aid Supplies";
- red_alert_access = 1;
+/obj/structure/window/spawner/directional/west,
+/obj/machinery/door/window/right/directional/north{
+ name = "Medical Supplies";
req_access = list("medical")
},
/turf/open/floor/iron/dark,
@@ -36213,13 +36184,9 @@
/area/station/commons/vacant_room/commissary)
"mSF" = (
/obj/structure/table/wood,
-/obj/item/storage/box/seccarts{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/storage/box/deputy,
/obj/machinery/light/directional/south,
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
"mSI" = (
@@ -36556,6 +36523,10 @@
/area/station/medical/virology)
"mYQ" = (
/obj/structure/table/wood,
+/obj/item/paper_bin/construction{
+ pixel_x = -2;
+ pixel_y = 6
+ },
/turf/open/floor/carpet/red,
/area/station/service/chapel/office)
"mZk" = (
@@ -36831,7 +36802,7 @@
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/box,
/obj/structure/disposalpipe/trunk,
-/obj/machinery/light_switch/directional/north,
+/obj/structure/sign/warning/radiation/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"ner" = (
@@ -37204,11 +37175,18 @@
pixel_y = 10;
req_one_access = list("ce","engineering")
},
-/obj/structure/closet/secure_closet/engineering_chief,
-/obj/item/gun/energy/e_gun/mini,
/obj/effect/turf_decal/siding/yellow{
dir = 5
},
+/obj/structure/rack,
+/obj/item/computer_disk/atmos{
+ pixel_y = 4;
+ pixel_x = 4
+ },
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"nkM" = (
@@ -37278,6 +37256,28 @@
/obj/structure/lattice/catwalk,
/turf/open/space/openspace,
/area/space/nearstation)
+"nlJ" = (
+/obj/structure/table/reinforced/rglass,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/window/spawner/directional/south,
+/obj/machinery/door/window/right/directional/west{
+ name = "Medical Supplies";
+ req_access = list("medical")
+ },
+/obj/item/storage/box/syringes{
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/chem_pack{
+ pixel_y = 9;
+ pixel_x = 9
+ },
+/obj/item/reagent_containers/chem_pack{
+ pixel_y = 9;
+ pixel_x = 9
+ },
+/obj/item/gun/syringe,
+/turf/open/floor/iron/dark,
+/area/station/medical/storage)
"nlW" = (
/obj/item/flashlight,
/obj/item/pen,
@@ -37334,9 +37334,9 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"nnk" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 6
- },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/item/kirbyplants/random,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"nno" = (
@@ -37736,6 +37736,25 @@
},
/turf/open/space/openspace,
/area/space)
+"nuh" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/storage/medkit/regular{
+ pixel_y = 2;
+ pixel_x = 4
+ },
+/obj/item/storage/medkit/toxin,
+/obj/item/storage/medkit/toxin{
+ pixel_x = 4;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/window/spawner/directional/west,
+/obj/machinery/door/window/right/directional/south{
+ name = "Medical Supplies";
+ req_access = list("medical")
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/storage)
"nul" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -38080,6 +38099,7 @@
/obj/machinery/light_switch/directional/south{
pixel_x = 5
},
+/obj/structure/spirit_board,
/turf/open/floor/iron/sepia,
/area/station/service/chapel)
"nAp" = (
@@ -38091,7 +38111,6 @@
/obj/machinery/computer/station_alert{
dir = 4
},
-/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
@@ -38161,6 +38180,7 @@
/area/station/service/hydroponics/park)
"nBC" = (
/obj/structure/sign/poster/official/random/directional/east,
+/obj/machinery/photocopier,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"nBT" = (
@@ -38921,6 +38941,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"nMe" = (
@@ -39097,9 +39118,8 @@
/obj/machinery/light/directional/west,
/obj/structure/table,
/obj/structure/sign/poster/contraband/atmosia_independence/directional/north,
-/obj/item/book/manual/wiki/atmospherics,
-/obj/item/t_scanner,
/obj/machinery/newscaster/directional/west,
+/obj/machinery/fax,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/atmos/control_center)
"nPU" = (
@@ -39156,10 +39176,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"nRL" = (
-/obj/structure/sign/poster/official/random,
-/turf/closed/wall/r_wall,
-/area/station/maintenance/department/bridge)
"nSd" = (
/obj/structure/sign/picture_frame/showroom/three{
pixel_x = -11;
@@ -39396,17 +39412,15 @@
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
"nXz" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/table/reinforced/rglass,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/window/spawner/directional/north,
+/obj/machinery/door/window/left/directional/west{
+ name = "Medical Supplies";
+ req_access = list("medical")
},
-/obj/effect/turf_decal/tile/blue,
-/obj/item/kirbyplants/random,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/thermal_regulator,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"nXA" = (
@@ -39553,7 +39567,7 @@
/obj/machinery/cell_charger{
pixel_y = 2
},
-/obj/machinery/newscaster/directional/south,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark/smooth_corner{
dir = 8
},
@@ -40067,6 +40081,11 @@
/obj/structure/closet/emcloset,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"ojv" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/maintenance/department/cargo)
"ojA" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -40554,6 +40573,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
+/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/sepia,
/area/station/service/chapel/funeral)
"oro" = (
@@ -42156,13 +42176,20 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/machinery/requests_console/directional/east{
department = "Medical";
name = "Morgue Requests Console"
},
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/mapping_helpers/requests_console/information,
+/obj/machinery/computer/records/medical/laptop{
+ dir = 8;
+ pixel_y = -6
+ },
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_y = 11;
+ pixel_x = 2
+ },
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"oUk" = (
@@ -42249,6 +42276,7 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/sepia,
/area/station/service/chapel/office)
"oVE" = (
@@ -42381,7 +42409,6 @@
"oXY" = (
/obj/machinery/light/directional/south,
/obj/structure/cable,
-/obj/machinery/firealarm/directional/south,
/turf/open/floor/plating,
/area/station/engineering/main)
"oYh" = (
@@ -43014,8 +43041,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/machinery/vending/wardrobe/engi_wardrobe,
-/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/plasteel{
+ amount = 10
+ },
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/machinery/light_switch/directional/north{
+ pixel_x = 7
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"pjr" = (
@@ -43150,12 +43188,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"pml" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/obj/machinery/fax_machine/recieving_disabled,
-/turf/open/floor/carpet/orange,
-/area/station/service/lawoffice)
"pmN" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -43197,6 +43229,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"pnG" = (
+/obj/machinery/light/warm/directional/west,
+/obj/structure/sign/clock/directional/west,
+/turf/open/floor/iron,
+/area/station/commons/dorms)
"pnH" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/red/filled/line,
@@ -43634,6 +43671,16 @@
dir = 8
},
/area/station/security/brig)
+"puh" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+ pixel_x = -6
+ },
+/obj/machinery/recharger{
+ pixel_x = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/office)
"puj" = (
/obj/item/radio/intercom/prison/directional/south,
/turf/open/floor/carpet/black,
@@ -43763,7 +43810,7 @@
"pxs" = (
/obj/machinery/camera{
c_tag = "Engineering - Equipment Room";
- dir = 1;
+ dir = 5;
network = list("ss13","engine")
},
/obj/effect/turf_decal/stripes/line{
@@ -43893,7 +43940,6 @@
/obj/machinery/modular_computer/console/preset/engineering{
dir = 1
},
-/obj/machinery/keycard_auth/directional/south,
/obj/effect/turf_decal/trimline/yellow/filled/end,
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -44633,11 +44679,9 @@
},
/area/station/commons/storage/art)
"pLC" = (
-/obj/item/clipboard,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/structure/rack,
/obj/effect/turf_decal/bot,
+/obj/structure/table/reinforced,
+/obj/machinery/fax,
/turf/open/floor/iron/sepia,
/area/station/hallway/secondary/service)
"pLM" = (
@@ -45505,6 +45549,7 @@
name = "Service Hall"
},
/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/service/library,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"qaJ" = (
@@ -45675,6 +45720,10 @@
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"qeh" = (
+/obj/structure/chair/office/light,
+/turf/open/floor/iron/dark,
+/area/station/science/breakroom)
"qei" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46076,17 +46125,11 @@
/area/station/security/brig)
"qka" = (
/obj/structure/table/reinforced/rglass,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/storage/medkit/regular{
+ pixel_y = 2;
+ pixel_x = 4
},
-/obj/effect/turf_decal/tile/blue,
/obj/item/storage/medkit/brute{
pixel_x = -1
},
@@ -46094,6 +46137,7 @@
pixel_x = 4;
pixel_y = -4
},
+/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"qki" = (
@@ -46735,6 +46779,7 @@
pixel_y = 30
},
/obj/structure/cable,
+/obj/item/clothing/glasses/sunglasses,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"quh" = (
@@ -47172,6 +47217,7 @@
"qzT" = (
/obj/machinery/vending/wardrobe/robo_wardrobe,
/obj/effect/turf_decal/bot,
+/obj/structure/sign/clock/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/station/science/robotics/lab)
"qAc" = (
@@ -47345,7 +47391,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/smooth_half{
dir = 4
},
@@ -47580,6 +47625,10 @@
/obj/machinery/status_display/evac/directional/north,
/obj/structure/table,
/obj/item/book/manual/wiki/tcomms,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = -1
+ },
/obj/item/crowbar,
/turf/open/floor/iron/showroomfloor,
/area/station/tcommsat/computer)
@@ -48112,7 +48161,7 @@
/area/station/service/kitchen/abandoned)
"qSU" = (
/obj/structure/closet,
-/obj/machinery/light/small/directional/west,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"qSY" = (
@@ -48449,12 +48498,10 @@
/turf/open/floor/plating,
/area/station/maintenance/central)
"qZk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
+/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"qZq" = (
@@ -48991,6 +49038,9 @@
pixel_y = 4
},
/obj/item/storage/box/lights/bulbs,
+/obj/item/lightreplacer{
+ pixel_y = 7
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"rhI" = (
@@ -49204,6 +49254,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/iron/white/textured,
/area/station/command/heads_quarters/captain/private)
"rlK" = (
@@ -50569,6 +50620,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rJc" = (
+/obj/structure/table/wood,
+/obj/machinery/fax/deluxe/starts_enabled,
+/turf/open/floor/carpet/royalblack,
+/area/station/security/detectives_office/bridge_officer_office)
"rJg" = (
/obj/machinery/computer/camera_advanced/base_construction{
dir = 8
@@ -50689,7 +50745,7 @@
/area/station/maintenance/starboard/aft)
"rLe" = (
/obj/machinery/light/directional/west,
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"rLf" = (
@@ -51327,6 +51383,7 @@
"rVc" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot,
+/obj/structure/sign/warning/secure_area/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/station/science/robotics/lab)
"rVf" = (
@@ -51694,30 +51751,9 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"sbi" = (
-/obj/machinery/door/window/left/directional/south{
- name = "First-Aid Supplies";
- red_alert_access = 1;
- req_access = list("medical")
- },
-/obj/structure/table/reinforced/rglass,
-/obj/item/storage/medkit/o2{
- pixel_x = 1;
- pixel_y = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/item/storage/medkit/o2{
- pixel_x = 4;
- pixel_y = -2
- },
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"sbp" = (
@@ -53055,19 +53091,10 @@
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
"syI" = (
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/vending/medical,
/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vending/wardrobe/medi_wardrobe,
+/obj/structure/sign/poster/official/moth_epi/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"syK" = (
@@ -53455,12 +53482,9 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"sEE" = (
-/obj/structure/rack,
-/obj/item/computer_disk/atmos,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
+/obj/structure/table/reinforced,
/obj/item/lighter,
+/obj/item/reagent_containers/pill/patch/aiuri,
/obj/item/clothing/glasses/meson{
pixel_y = 4
},
@@ -53588,11 +53612,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"sGH" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
"sGK" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -53659,6 +53678,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"sHJ" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/upper)
"sHL" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/cafeteria,
@@ -54138,9 +54167,11 @@
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/paper_bin,
-/obj/item/pen/red,
+/obj/item/clipboard{
+ pixel_x = 28;
+ pixel_y = 3
+ },
+/obj/machinery/fax,
/turf/open/floor/iron,
/area/station/cargo/office)
"sPz" = (
@@ -54288,12 +54319,12 @@
/obj/structure/table,
/obj/machinery/light/directional/west,
/obj/machinery/recharger{
- pixel_x = 8;
+ pixel_x = 6;
pixel_y = 3
},
/obj/item/radio/intercom/directional/west,
/obj/machinery/recharger{
- pixel_x = -4;
+ pixel_x = -6;
pixel_y = 3
},
/obj/machinery/camera{
@@ -54980,15 +55011,6 @@
/obj/structure/sign/warning/cold_temp/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"tes" = (
-/obj/machinery/button/door{
- id = "bridge blast";
- name = "Bridge Shutters Control";
- pixel_x = 27;
- pixel_y = -2
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"teI" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{
dir = 1
@@ -54997,18 +55019,16 @@
/area/station/maintenance/disposal/incinerator)
"teK" = (
/obj/machinery/airalarm/directional/north,
-/obj/structure/cable,
-/obj/machinery/suit_storage_unit/medical,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/storage/belt/medical{
+ pixel_y = 2
},
+/obj/item/clothing/gloves/latex,
+/obj/item/clothing/gloves/latex/nitrile,
+/obj/item/clothing/glasses/hud/health,
+/obj/item/clothing/neck/stethoscope,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"teP" = (
@@ -55335,6 +55355,12 @@
dir = 1
},
/area/station/engineering/lobby)
+"tlr" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/security/telescreen/entertainment/directional/south,
+/obj/machinery/fax/deluxe/starts_enabled,
+/turf/open/floor/carpet/orange,
+/area/station/service/lawoffice)
"tlz" = (
/obj/structure/sign/departments/chemistry/pharmacy,
/turf/closed/wall,
@@ -55592,7 +55618,6 @@
c_tag = "Central Hallway - Hydroponics";
dir = 6
},
-/obj/machinery/newscaster/directional/east,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
@@ -55710,7 +55735,6 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
-/obj/machinery/light_switch/directional/west,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
@@ -56054,20 +56078,13 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"tyg" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/rnd/production/techfab/department/medical,
-/obj/effect/turf_decal/delivery,
/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron/white,
/area/station/medical/storage)
"tyo" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -56674,10 +56691,10 @@
/obj/machinery/computer/atmos_alert{
dir = 4
},
-/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 10
},
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"tLO" = (
@@ -56922,6 +56939,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
+/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"tPT" = (
@@ -56992,16 +57010,9 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"tQN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
},
-/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"tQW" = (
@@ -57615,6 +57626,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"ubZ" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/closet/crate{
+ name = "DIY Canister Kit"
+ },
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/plasteel{
+ amount = 25;
+ pixel_y = 4;
+ pixel_x = -4
+ },
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
"ucl" = (
/obj/machinery/duct,
/turf/open/floor/plating,
@@ -58923,6 +58953,16 @@
/obj/effect/landmark/navigate_destination,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"uBx" = (
+/obj/machinery/keycard_auth{
+ pixel_x = 24
+ },
+/obj/structure/closet/secure_closet/engineering_chief,
+/obj/item/gun/energy/e_gun/mini,
+/obj/effect/turf_decal/bot_red,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"uBH" = (
/turf/open/floor/engine/air,
/area/station/engineering/atmos)
@@ -59058,7 +59098,6 @@
/area/station/maintenance/port/lower)
"uDV" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
@@ -59227,6 +59266,13 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"uHO" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron,
+/area/station/service/kitchen)
"uHQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
@@ -59411,12 +59457,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood/large,
/area/station/service/library)
-"uKZ" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/landmark/blobstart,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/experiment_room)
"uLd" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -60165,10 +60205,6 @@
/obj/effect/spawner/random/trash/hobo_squat,
/turf/open/floor/wood,
/area/station/maintenance/starboard/aft)
-"uXV" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
"uYf" = (
/obj/machinery/computer/records/security{
dir = 4
@@ -61022,7 +61058,6 @@
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
"voL" = (
-/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Treatment Center"
},
@@ -61031,6 +61066,7 @@
dir = 10
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
+/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"voY" = (
@@ -61130,11 +61166,10 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"vqK" = (
-/obj/effect/landmark/event_spawn,
-/obj/machinery/holopad,
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/medical_doctor,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
"vqT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61610,7 +61645,6 @@
/obj/structure/closet/secure_closet/chief_medical,
/obj/item/computer_disk/medical,
/obj/machinery/light/directional/north,
-/obj/item/gun/energy/e_gun/mini,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -61619,6 +61653,7 @@
dir = 4
},
/obj/machinery/light_switch/directional/north,
+/obj/item/gun/energy/e_gun/mini,
/turf/open/floor/iron,
/area/station/command/heads_quarters/cmo)
"vBl" = (
@@ -61869,10 +61904,11 @@
/area/station/medical/chemistry)
"vFA" = (
/obj/structure/table,
-/obj/item/reagent_containers/cup/beaker/large,
-/obj/item/reagent_containers/cup/beaker{
- pixel_x = 8
+/obj/item/experi_scanner{
+ pixel_y = 5;
+ pixel_x = 4
},
+/obj/item/experi_scanner,
/turf/open/floor/iron/dark/smooth_corner{
dir = 4
},
@@ -62137,6 +62173,9 @@
/obj/effect/turf_decal/stripes/box,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
+/obj/machinery/light_switch/directional/east{
+ pixel_y = 6
+ },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"vLW" = (
@@ -62502,9 +62541,10 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
-/obj/structure/sign/poster/official/moth_epi/directional/west,
-/obj/effect/turf_decal/bot_red,
-/obj/machinery/recharge_station,
+/obj/machinery/fax,
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"vTt" = (
@@ -62968,11 +63008,11 @@
/turf/open/floor/wood,
/area/station/service/library)
"wcY" = (
-/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/tile/neutral/full,
/obj/machinery/pdapainter/engineering,
/obj/effect/turf_decal/bot_red,
/mob/living/simple_animal/parrot/poly,
+/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/ce)
"wdc" = (
@@ -63155,6 +63195,7 @@
/area/station/medical/virology)
"wgk" = (
/obj/structure/bookcase,
+/obj/structure/sign/calendar/directional/east,
/turf/open/floor/carpet/black,
/area/station/medical/psychology)
"wgp" = (
@@ -63205,11 +63246,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/lower)
"whL" = (
-/obj/structure/sign/poster/official/random/directional/east,
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/structure/sign/clock/directional/east,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
"whM" = (
@@ -63345,9 +63386,7 @@
/obj/effect/spawner/random/vending/colavend,
/obj/effect/turf_decal/bot,
/obj/machinery/firealarm/directional/east,
-/obj/machinery/light_switch/directional/east{
- pixel_x = 39
- },
+/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
"wkU" = (
@@ -63446,7 +63485,9 @@
/area/station/security/prison)
"wlJ" = (
/obj/effect/decal/cleanable/generic,
-/obj/machinery/duct,
+/obj/structure/railing{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"wlL" = (
@@ -63750,6 +63791,10 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"wqQ" = (
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/sepia,
+/area/station/service/chapel/office)
"wqS" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/three,
@@ -64039,6 +64084,7 @@
dir = 8
},
/obj/effect/landmark/start/hangover,
+/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/upper)
"wwT" = (
@@ -65238,6 +65284,17 @@
/obj/structure/flora/bush/jungle/c/style_random,
/turf/open/floor/grass,
/area/station/medical/medbay/central)
+"wVs" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_y = 4;
+ pixel_x = 1
+ },
+/obj/item/nullrod,
+/obj/machinery/light/small/red/dim/directional/east,
+/obj/effect/turf_decal/tile/dark_red/diagonal_centre,
+/turf/open/floor/iron/dark/diagonal,
+/area/station/service/chapel/office)
"wVv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66341,6 +66398,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
+/obj/structure/sign/calendar/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/captain)
"xpw" = (
@@ -66505,17 +66563,16 @@
/area/station/engineering/main)
"xsy" = (
/obj/structure/cable,
-/obj/structure/sink/directional/west,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/machinery/requests_console{
department = "Medical";
name = "Medbay RC";
pixel_y = -30
},
/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"xsG" = (
@@ -66833,6 +66890,8 @@
/area/station/maintenance/fore)
"xyF" = (
/obj/structure/table,
+/obj/item/radio/intercom/directional/north,
+/obj/item/paper_bin,
/obj/item/stamp{
pixel_x = -3;
pixel_y = 3
@@ -66841,7 +66900,7 @@
pixel_x = 4;
pixel_y = -2
},
-/obj/item/radio/intercom/directional/north,
+/obj/item/pen/red,
/turf/open/floor/iron,
/area/station/cargo/office)
"xyI" = (
@@ -67282,8 +67341,8 @@
/area/station/maintenance/port/lower)
"xGL" = (
/obj/structure/table/reinforced,
-/obj/item/pen,
/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"xGV" = (
@@ -67452,6 +67511,13 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/openspace,
/area/station/science/xenobiology)
+"xJK" = (
+/obj/effect/landmark/start/medical_doctor,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/storage)
"xJN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible,
/obj/machinery/meter,
@@ -67567,7 +67633,6 @@
charge = 100;
maxcharge = 15000
},
-/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -67578,6 +67643,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"xMv" = (
@@ -67871,23 +67937,9 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/lower)
"xSq" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/stack/sheet/plasteel{
- amount = 10
- },
-/obj/item/stack/sheet/plasteel{
- amount = 10
- },
/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"xSs" = (
@@ -68217,6 +68269,7 @@
/obj/machinery/light/directional/north,
/obj/structure/cable,
/obj/machinery/power/emitter/welded,
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/plating,
/area/station/engineering/main)
"xXn" = (
@@ -68545,6 +68598,9 @@
/obj/structure/closet/l3closet/scientist,
/obj/effect/turf_decal/stripes/box,
/obj/structure/sign/poster/official/random/directional/east,
+/obj/machinery/light_switch/directional/west{
+ pixel_x = -38
+ },
/turf/open/floor/iron/showroomfloor,
/area/station/science/explab)
"ycS" = (
@@ -68577,11 +68633,10 @@
/turf/open/floor/plating,
/area/station/maintenance/department/science)
"ydq" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
"ydA" = (
/obj/effect/decal/cleanable/dirt,
@@ -68606,6 +68661,15 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/pharmacy)
+"yee" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/structure/filingcabinet,
+/turf/open/floor/iron,
+/area/station/maintenance/department/cargo)
"yew" = (
/obj/structure/window/spawner/directional/north,
/obj/structure/window/spawner/directional/south,
@@ -68917,12 +68981,11 @@
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
},
-/obj/item/book/manual/wiki/infections{
- pixel_y = 2
- },
-/obj/item/reagent_containers/syringe/antiviral,
/obj/machinery/newscaster/directional/south,
/obj/structure/table/reinforced,
+/obj/machinery/fax{
+ pixel_y = 2
+ },
/turf/open/floor/iron/showroomfloor,
/area/station/medical/virology)
"yjz" = (
@@ -86462,7 +86525,7 @@ vln
aJm
mJd
fmT
-uKZ
+ipQ
vSv
vzc
xoJ
@@ -152446,7 +152509,7 @@ tHg
qUf
lml
tXb
-fcy
+puh
qpp
rYP
qvr
@@ -152504,7 +152567,7 @@ vWm
qks
noU
fQi
-eeX
+ubZ
oEC
oIu
oIu
@@ -152745,11 +152808,11 @@ eJn
fyy
oar
jsh
-dya
+jsh
eHE
jsh
eHE
-dya
+jsh
jsh
pjl
qQp
@@ -153006,7 +153069,7 @@ pwV
pwV
nJI
dxq
-dxq
+kzk
xcW
hkH
qQp
@@ -154021,9 +154084,9 @@ fXe
fXe
fXe
fXe
-fXe
-fXe
-fXe
+uBx
+cHY
+itY
itY
fcv
eGb
@@ -154275,12 +154338,12 @@ rpV
tim
kuW
fci
-qIj
idP
-dBo
-fci
-lVf
-hcL
+aOL
+fXe
+fXe
+fXe
+fXe
kHN
cwi
gql
@@ -154535,14 +154598,14 @@ fci
dGV
fci
fci
-fci
+lmR
kkk
wlJ
-fXe
+cSk
fci
ifI
-pmi
-fIW
+fyy
+dJb
fWk
lzm
rzN
@@ -154791,9 +154854,9 @@ htl
cSk
gkv
gxK
-cSk
vbF
-cSk
+hcL
+hcL
laL
hcL
wLB
@@ -155032,7 +155095,7 @@ jEd
nKX
fci
jYF
-uXV
+qIj
ooh
fXe
qyF
@@ -159938,7 +160001,7 @@ pHr
dOs
cGE
krN
-pml
+tlr
sgz
sgz
sgz
@@ -161177,7 +161240,7 @@ iUx
jKs
jKs
rlo
-coE
+eee
jKs
dVg
hlh
@@ -161467,7 +161530,7 @@ pMP
tWq
qGQ
iEP
-sFo
+bYB
fPU
bZm
gkC
@@ -162202,7 +162265,7 @@ ggR
acN
ggR
bJP
-ggV
+wqQ
vnX
rVt
ful
@@ -162280,8 +162343,8 @@ unl
fcf
mZX
jec
+yee
slw
-ejm
llI
slw
eUJ
@@ -162462,8 +162525,8 @@ ggR
ggR
ggR
ggR
-ggR
-ggR
+bWj
+jKs
wmS
rvq
hQO
@@ -162537,8 +162600,8 @@ hBC
pKm
lco
bJy
+ojv
mRa
-gYs
uKw
pyX
wfv
@@ -162717,9 +162780,9 @@ qcv
acN
ggR
qSU
-ljS
-lnZ
-ffG
+upL
+ggR
+aKF
ggR
dNI
ggR
@@ -162794,9 +162857,9 @@ sdD
wYF
vWh
bkc
+mcl
slw
-sGH
-iiq
+stF
slw
nil
eei
@@ -162973,10 +163036,10 @@ ggR
tDt
acN
ggR
-upL
+ljS
lnZ
-upL
-upL
+ggR
+wVs
ggR
dfl
ggR
@@ -163052,7 +163115,7 @@ lqh
lco
rDP
slw
-jGt
+slw
agd
slw
slw
@@ -163309,7 +163372,7 @@ qci
cGM
qwW
slw
-jGt
+ovY
wzq
eys
fom
@@ -166600,7 +166663,7 @@ pNc
xFv
pCn
mgB
-qvO
+uHO
jep
rJk
oaF
@@ -166857,8 +166920,8 @@ oAL
oAL
oAL
oAL
-ezs
oAL
+sHJ
oAL
oAL
oAL
@@ -167369,7 +167432,7 @@ gzx
lhl
gdt
rZv
-gzx
+hBp
gzx
lob
fPr
@@ -167379,9 +167442,9 @@ fPr
gzx
wwN
sIU
+amL
gzx
-lhl
-hCx
+gdt
tpq
onN
bJv
@@ -168633,7 +168696,7 @@ fSl
fSl
pcd
kGA
-fWd
+pnG
dHa
rLz
mNU
@@ -170446,7 +170509,7 @@ jCU
xxF
kDo
ojD
-tBw
+kCg
bDY
cOD
bpf
@@ -172293,7 +172356,7 @@ ora
rCK
wBu
mkx
-bLN
+jRe
ora
mQL
oqB
@@ -172821,7 +172884,7 @@ kyk
gVS
gVS
bJn
-nRL
+kYI
kYI
kcr
mio
@@ -173279,7 +173342,7 @@ kEl
tPE
uQv
uQv
-nnk
+uQv
tyg
hmb
bzI
@@ -173788,12 +173851,12 @@ xZg
rxv
skX
tBw
-fOY
-hmb
-hmb
+lsM
hmb
+nuh
+htL
sbi
-tQN
+xJK
mMb
hmb
bZk
@@ -174045,10 +174108,10 @@ sEg
pdL
yjl
tBw
-kZi
+qEh
hmb
lwX
-hmb
+nlJ
brr
nXz
qka
@@ -174563,7 +174626,7 @@ xOt
ihy
gyV
czv
-gdS
+wAF
rLe
dtf
leN
@@ -174863,7 +174926,7 @@ bhg
xSz
atb
oKe
-cSp
+rJc
pSG
dam
aCS
@@ -175387,7 +175450,7 @@ kwg
hbQ
pBO
pBO
-tes
+kyk
pBO
pBO
jAm
@@ -177642,7 +177705,7 @@ pUb
aHn
axM
aHn
-pib
+uuw
pib
pib
pib
@@ -178159,7 +178222,7 @@ axM
jTL
boP
saj
-boP
+qeh
iJv
pib
mlj
@@ -178932,7 +178995,7 @@ rTt
mPc
lQp
wkO
-pib
+uuw
iYg
xoL
rPO
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 524a6798f180..4595d23f6f1d 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -249,6 +249,8 @@
/area/station/command/heads_quarters/qm)
"aaL" = (
/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/fax/deluxe,
+/obj/structure/table,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
"aaM" = (
@@ -357,6 +359,7 @@
/obj/structure/table,
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/machinery/airalarm/directional/north,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/cargo/sorting)
"abe" = (
@@ -1872,16 +1875,6 @@
dir = 4
},
/area/station/ai_monitored/turret_protected/aisat_interior)
-"agh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/structure/transit_tube/station/dispenser/reverse/flipped{
- dir = 4
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"agi" = (
/obj/machinery/door/poddoor{
id = "executionspaceblast"
@@ -2816,11 +2809,8 @@
/obj/structure/plaque/static_plaque/golden{
pixel_y = 32
},
-/obj/item/storage/box/handcuffs{
- pixel_x = 1;
- pixel_y = 3
- },
/obj/machinery/light/directional/north,
+/obj/machinery/fax,
/turf/open/floor/iron/large,
/area/station/security)
"ajo" = (
@@ -3083,10 +3073,9 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hos)
"akc" = (
-/obj/structure/table/wood,
-/obj/machinery/recharger,
/obj/machinery/status_display/evac/directional/north,
/obj/machinery/light/directional/north,
+/obj/structure/closet/secure_closet/hos,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hos)
"akd" = (
@@ -3100,11 +3089,11 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hos)
"ake" = (
-/obj/structure/closet/secure_closet/hos,
/obj/machinery/button/door/directional/east{
id = "hos_spess_shutters";
name = "Window Shutters"
},
+/obj/structure/table/wood,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hos)
"akf" = (
@@ -4362,6 +4351,8 @@
/obj/effect/turf_decal/tile/red/half{
dir = 1
},
+/obj/machinery/fax,
+/obj/structure/table/wood,
/turf/open/floor/iron/dark/smooth_half,
/area/station/command/heads_quarters/hos)
"anU" = (
@@ -4698,6 +4689,11 @@
dir = 4
},
/obj/effect/turf_decal/tile/red/half,
+/obj/item/storage/box/handcuffs{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/structure/table,
/turf/open/floor/iron/edge,
/area/station/security)
"apc" = (
@@ -5366,17 +5362,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/command/bridge)
-"arC" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- pixel_y = 2
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/structure/transit_tube/station/dispenser/reverse/flipped{
- dir = 1
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/command/bridge)
"arD" = (
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 2
@@ -7544,7 +7529,6 @@
/area/station/command/heads_quarters/captain)
"axT" = (
/obj/structure/table/wood,
-/obj/machinery/recharger,
/obj/machinery/requests_console/directional/north{
department = "Captain's Desk";
name = "Captain's Requests Console"
@@ -7552,6 +7536,7 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/fax,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"axU" = (
@@ -7685,13 +7670,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/port)
-"ayB" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/chair/stool/bar/directional/west,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/port)
"ayD" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -8610,12 +8588,7 @@
pixel_y = 4
},
/obj/structure/table/wood,
-/obj/item/paper_bin{
- layer = 2.9
- },
-/obj/item/pen{
- layer = 4
- },
+/obj/machinery/fax/deluxe,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"aBA" = (
@@ -8631,13 +8604,13 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"aBC" = (
-/obj/structure/closet/secure_closet/hop,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the monastery.";
name = "Monastery Monitor";
network = list("monastery");
pixel_y = 32
},
+/obj/machinery/photocopier,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"aBD" = (
@@ -8793,24 +8766,21 @@
/area/station/service/lawoffice)
"aCi" = (
/obj/structure/table/wood,
-/obj/item/kirbyplants{
- icon_state = "plant-18";
- pixel_y = 12
- },
+/obj/machinery/fax,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"aCj" = (
-/obj/machinery/holopad,
/obj/machinery/light/small/directional/north,
+/obj/item/kirbyplants{
+ icon_state = "plant-18";
+ pixel_y = 12
+ },
+/obj/structure/table/wood,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"aCl" = (
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
-"aCm" = (
-/obj/item/storage/briefcase,
-/turf/open/floor/iron/grimy,
-/area/station/security/detectives_office)
"aCn" = (
/obj/machinery/vending/wardrobe/det_wardrobe,
/obj/machinery/light/small/directional/north,
@@ -9009,7 +8979,7 @@
pixel_x = -26;
pixel_y = 6
},
-/obj/machinery/photocopier,
+/obj/item/kirbyplants/random,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"aCQ" = (
@@ -9496,6 +9466,7 @@
pixel_x = 3;
pixel_y = 6
},
+/obj/item/storage/briefcase,
/turf/open/floor/carpet,
/area/station/security/detectives_office)
"aEn" = (
@@ -9591,6 +9562,7 @@
"aEz" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
+/obj/item/camera,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"aEB" = (
@@ -9945,7 +9917,9 @@
/area/station/commons/storage/primary)
"aFw" = (
/obj/structure/table/wood,
-/obj/item/camera,
+/obj/machinery/recharger{
+ pixel_x = -4
+ },
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"aFx" = (
@@ -10307,12 +10281,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"aGL" = (
-/obj/item/clothing/suit/apron/chef,
-/obj/structure/chair/stool/bar/directional/west,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
"aGM" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -10756,16 +10724,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard)
-"aJq" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/starboard)
"aJw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -11262,10 +11220,6 @@
/obj/machinery/vending/cola,
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
-"aLE" = (
-/obj/structure/sink/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet/auxiliary)
"aLF" = (
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
@@ -13031,11 +12985,9 @@
name = "Kitchen Delivery";
req_access = list("kitchen")
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
/area/station/service/kitchen/coldroom)
-"aSM" = (
-/turf/open/floor/iron/dark,
-/area/station/maintenance/department/crew_quarters/bar)
"aSN" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/effect/mapping_helpers/broken_floor,
@@ -13081,7 +13033,6 @@
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
"aSY" = (
-/obj/structure/table,
/obj/machinery/camera{
c_tag = "Cargo Foyer";
dir = 4
@@ -13093,6 +13044,7 @@
/obj/machinery/light_switch/directional/east{
name = "Light Switch"
},
+/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/iron/dark,
/area/station/cargo/office)
"aTk" = (
@@ -14193,6 +14145,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
"aXc" = (
@@ -14366,10 +14319,10 @@
},
/area/station/cargo/sorting)
"aXw" = (
-/obj/machinery/rnd/production/techfab/department/cargo,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
+/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/cargo/sorting)
"aXx" = (
@@ -14633,10 +14586,13 @@
/turf/open/floor/iron,
/area/station/cargo/sorting)
"aYv" = (
-/obj/machinery/autolathe,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
},
+/obj/structure/table,
+/obj/item/storage/box/shipping{
+ pixel_y = 8
+ },
/turf/open/floor/iron/dark,
/area/station/cargo/sorting)
"aYw" = (
@@ -15106,24 +15062,20 @@
/turf/open/floor/iron,
/area/station/cargo/sorting)
"bav" = (
-/obj/machinery/photocopier,
-/obj/effect/turf_decal/trimline/brown/filled/end{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Cargo Office";
dir = 8
},
/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/half,
/area/station/cargo/sorting)
"baw" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "Delivery";
name = "Delivery";
- pixel_x = -11;
- pixel_y = -3
+ pixel_x = -6;
+ pixel_y = 2
},
/turf/open/floor/iron/half,
/area/station/cargo/sorting)
@@ -15135,8 +15087,8 @@
dir = 8;
id = "TrashMover";
name = "Trash Mover";
- pixel_x = 13;
- pixel_y = -5
+ pixel_x = 8;
+ pixel_y = 3
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
@@ -15513,6 +15465,7 @@
"bbU" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
+/obj/structure/closet/secure_closet/hop,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"bbV" = (
@@ -17700,7 +17653,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/status_display/evac/directional/north,
+/obj/structure/sign/poster/official/report_crimes/directional/north,
/turf/open/floor/iron,
/area/station/science/breakroom)
"bkA" = (
@@ -18106,7 +18059,7 @@
dir = 8
},
/obj/effect/spawner/random/vending/colavend,
-/obj/item/radio/intercom/directional/west,
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
/turf/open/floor/iron,
/area/station/science/breakroom)
"blR" = (
@@ -18164,9 +18117,6 @@
/area/station/hallway/secondary/entry)
"bmh" = (
/obj/structure/table,
-/obj/machinery/computer/records/medical/laptop{
- dir = 8
- },
/obj/machinery/requests_console/directional/east{
department = "Medical";
name = "Morgue Requests Console"
@@ -18175,6 +18125,7 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/fax,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"bmi" = (
@@ -18366,6 +18317,7 @@
dir = 1
},
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/science/breakroom)
"bnb" = (
@@ -18598,8 +18550,6 @@
/area/station/science/breakroom)
"bnY" = (
/obj/structure/table/wood,
-/obj/item/folder,
-/obj/item/clipboard,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -18610,6 +18560,11 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/machinery/fax{
+ fax_name = "Research Division";
+ name = "Research Division Fax Machine";
+ pixel_x = 1
+ },
/turf/open/floor/iron,
/area/station/science/breakroom)
"bod" = (
@@ -21989,34 +21944,7 @@
/obj/structure/chair/stool/bar/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"bzF" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/storage)
-"bzG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/storage)
"bzI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -22026,6 +21954,9 @@
/obj/effect/turf_decal/siding/blue{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
"bzJ" = (
@@ -22271,10 +22202,6 @@
/obj/structure/transit_tube/horizontal,
/turf/open/floor/iron/smooth_half,
/area/station/hallway/secondary/entry)
-"bAL" = (
-/obj/structure/transit_tube/station/dispenser/reverse/flipped,
-/turf/open/floor/iron/smooth_large,
-/area/station/hallway/secondary/entry)
"bAM" = (
/obj/item/extinguisher,
/obj/structure/cable,
@@ -22311,7 +22238,6 @@
/turf/open/floor/iron/white/smooth_half,
/area/station/medical/storage)
"bAP" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
@@ -22436,7 +22362,6 @@
},
/area/station/command/heads_quarters/rd)
"bBu" = (
-/obj/item/kirbyplants/dead,
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -22464,6 +22389,8 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 4
},
+/obj/machinery/fax,
+/obj/structure/table/glass,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/rd)
"bBw" = (
@@ -22705,6 +22632,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/computer_disk/medical,
+/obj/item/computer_disk/medical,
+/obj/item/computer_disk/medical,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"bCj" = (
@@ -22786,13 +22716,11 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bCE" = (
-/obj/machinery/computer/robotics{
- dir = 4
- },
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/purple/half{
dir = 8
},
+/obj/item/kirbyplants/dead/research_director,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/rd)
"bCG" = (
@@ -23014,6 +22942,7 @@
/obj/machinery/light_switch/directional/east{
name = "Light Switch"
},
+/obj/machinery/photocopier,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"bDy" = (
@@ -23034,14 +22963,14 @@
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
"bDB" = (
-/obj/machinery/computer/rdconsole{
- dir = 4
- },
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple/half{
dir = 8
},
+/obj/machinery/computer/robotics{
+ dir = 4
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/rd)
"bDC" = (
@@ -23271,14 +23200,6 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/ordnance/testlab)
-"bEk" = (
-/obj/machinery/meter,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold/general/visible,
-/obj/machinery/light/small/directional/south,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"bEl" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -23334,9 +23255,6 @@
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
"bEE" = (
-/obj/machinery/modular_computer/console/preset/civilian{
- dir = 1
- },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -23347,12 +23265,8 @@
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"bEF" = (
-/obj/item/computer_disk/medical,
-/obj/item/computer_disk/medical,
-/obj/item/computer_disk/medical,
/obj/structure/table,
/obj/machinery/light/directional/south,
-/obj/item/wrench/medical,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -23362,6 +23276,7 @@
/obj/machinery/airalarm/directional/south,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
+/obj/machinery/fax,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"bEN" = (
@@ -23613,7 +23528,9 @@
/area/station/maintenance/department/engine)
"bFI" = (
/mob/living/carbon/human/species/monkey,
-/turf/open/floor/iron/freezer,
+/obj/structure/flora/grass/jungle/b/style_random,
+/obj/structure/flora/bush/lavendergrass/style_random,
+/turf/open/floor/grass,
/area/station/medical/virology)
"bFJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23636,7 +23553,9 @@
"bFL" = (
/mob/living/carbon/human/species/monkey,
/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/freezer,
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
/area/station/medical/virology)
"bFM" = (
/obj/effect/turf_decal/trimline/blue/line{
@@ -25318,14 +25237,6 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine,
/area/station/maintenance/department/engine)
-"bMC" = (
-/obj/item/stack/spacecash/c10,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/department/engine)
"bMD" = (
/obj/effect/decal/cleanable/oil,
/obj/machinery/duct,
@@ -25520,12 +25431,6 @@
"bNw" = (
/turf/closed/wall,
/area/station/service/chapel/dock)
-"bNx" = (
-/obj/structure/transit_tube/station/dispenser/reverse{
- dir = 1
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/service/chapel/dock)
"bNy" = (
/obj/structure/transit_tube/horizontal,
/obj/machinery/camera{
@@ -26020,11 +25925,6 @@
"bPB" = (
/turf/closed/wall/r_wall,
/area/station/engineering/gravity_generator)
-"bPC" = (
-/obj/structure/chair/stool/bar/directional/west,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"bPD" = (
/obj/structure/table,
/obj/item/trash/chips,
@@ -26204,7 +26104,11 @@
/area/space/nearstation)
"bQj" = (
/obj/effect/landmark/blobstart,
-/turf/open/floor/iron/freezer,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/structure/flora/bush/ferny/style_random,
+/turf/open/floor/grass,
/area/station/medical/virology)
"bQl" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -26949,11 +26853,10 @@
/turf/open/floor/plating,
/area/station/engineering/lobby)
"bSP" = (
-/obj/item/kirbyplants{
- icon_state = "plant-02"
- },
/obj/structure/sign/departments/engineering/directional/south,
/obj/effect/turf_decal/tile/yellow/anticorner,
+/obj/machinery/fax,
+/obj/structure/table,
/turf/open/floor/iron/corner{
dir = 1
},
@@ -27522,15 +27425,12 @@
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/ce)
"bUI" = (
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
/obj/structure/table/reinforced,
-/obj/item/computer_disk/atmos,
/obj/effect/turf_decal/sub_tile/dark/anticorner,
/obj/effect/turf_decal/tile/yellow/anticorner{
dir = 1
},
+/obj/machinery/fax,
/turf/open/floor/iron/corner,
/area/station/command/heads_quarters/ce)
"bUJ" = (
@@ -28072,6 +27972,10 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 8
},
+/obj/item/computer_disk/atmos,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
/turf/open/floor/iron/half{
dir = 8
},
@@ -30410,15 +30314,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/service/chapel/monastery)
-"cis" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
-/obj/effect/turf_decal/tile/green/half{
- dir = 1
- },
-/turf/open/floor/iron/white/smooth_edge{
- dir = 1
- },
-/area/station/medical/virology)
"cit" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -32385,6 +32280,7 @@
dir = 4
},
/obj/machinery/light/small/directional/south,
+/obj/structure/closet/crate/bin,
/turf/open/floor/iron/dark/smooth_corner{
dir = 4
},
@@ -33303,8 +33199,7 @@
/area/station/service/library)
"czp" = (
/obj/structure/table/wood,
-/obj/item/disk/nuclear/fake,
-/obj/item/barcodescanner,
+/obj/machinery/fax,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library)
"czr" = (
@@ -33323,6 +33218,8 @@
pixel_x = -2;
pixel_y = 4
},
+/obj/item/folder/yellow,
+/obj/item/pen,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library)
"czv" = (
@@ -33364,8 +33261,6 @@
/area/station/service/library)
"czD" = (
/obj/structure/table/wood,
-/obj/item/folder/yellow,
-/obj/item/pen,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library)
"czH" = (
@@ -33397,6 +33292,9 @@
"czN" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
+/obj/item/barcodescanner{
+ pixel_y = 5
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library)
"czO" = (
@@ -33471,6 +33369,7 @@
/area/station/service/library)
"cAu" = (
/obj/structure/table/wood,
+/obj/item/disk/nuclear/fake/obvious,
/obj/item/clothing/head/costume/pharaoh,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library)
@@ -33725,6 +33624,8 @@
dir = 8
},
/obj/machinery/vending/cigarette,
+/obj/machinery/status_display/ai/directional/north,
+/obj/structure/sign/calendar/directional/west,
/turf/open/floor/iron,
/area/station/science/breakroom)
"cBT" = (
@@ -34176,6 +34077,18 @@
/obj/structure/bodycontainer/morgue,
/turf/open/floor/iron/dark/smooth_half,
/area/station/medical/morgue)
+"cUF" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/fax/deluxe/starts_enabled,
+/turf/open/floor/carpet/royalblack,
+/area/station/security/detectives_office/bridge_officer_office)
"cVa" = (
/obj/effect/turf_decal/tile/neutral/anticorner{
dir = 1
@@ -34223,10 +34136,6 @@
},
/turf/open/floor/plating,
/area/station/science/lab)
-"cYY" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/security/brig)
"daO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/smooth,
@@ -34716,6 +34625,11 @@
dir = 4
},
/area/station/security/prison)
+"dxd" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"dxo" = (
/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
@@ -34770,6 +34684,16 @@
},
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"dAA" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard)
"dAF" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external,
@@ -34944,12 +34868,6 @@
dir = 8
},
/area/station/science/research)
-"dGO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/service/bar)
"dGR" = (
/turf/open/floor/iron/smooth_corner,
/area/station/ai_monitored/command/storage/eva)
@@ -35259,10 +35177,10 @@
/turf/open/floor/plating,
/area/station/security/execution/transfer)
"dVK" = (
-/obj/structure/table,
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
+/obj/machinery/photocopier,
/turf/open/floor/iron/dark,
/area/station/cargo/sorting)
"dWk" = (
@@ -35503,6 +35421,10 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/storage)
+"ehL" = (
+/obj/structure/sink/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet/auxiliary)
"ehM" = (
/obj/effect/decal/remains/human,
/obj/structure/disposaloutlet,
@@ -36281,6 +36203,12 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"eNM" = (
+/obj/structure/transit_tube/station/dispenser/reverse{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/service/chapel/dock)
"eOe" = (
/obj/effect/turf_decal/trimline/green/line{
dir = 8
@@ -36650,10 +36578,13 @@
"faP" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/med/surgery{
- pixel_y = 5
+ pixel_y = 14
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/sign/poster/official/safety_report/directional/east,
+/obj/machinery/computer/records/medical/laptop{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"faT" = (
@@ -37886,11 +37817,7 @@
},
/area/station/commons/fitness/recreation)
"fWl" = (
-/obj/effect/turf_decal/tile/green/half,
-/obj/effect/turf_decal/tile/green/half{
- dir = 1
- },
-/turf/open/floor/iron/white/smooth_half,
+/turf/open/floor/iron/white,
/area/station/medical/virology)
"fWq" = (
/obj/effect/turf_decal/bot,
@@ -37932,6 +37859,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/edge,
/area/station/security/prison)
+"fXo" = (
+/obj/item/clothing/suit/apron/chef,
+/obj/structure/chair/stool/bar/directional/west,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/cargo)
"fYf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -38198,6 +38131,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/structure/closet/secure_closet/medical1,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"gkG" = (
@@ -38309,6 +38243,10 @@
"gnX" = (
/turf/closed/wall,
/area/station/science/ordnance/testlab)
+"gop" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"goL" = (
/turf/closed/wall,
/area/station/service/chapel/storage)
@@ -38943,11 +38881,6 @@
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
-"gLZ" = (
-/obj/structure/cable,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/wood,
-/area/station/maintenance/department/engine)
"gMA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -39008,14 +38941,6 @@
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
/area/station/science/genetics)
-"gPY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/security/brig)
"gQa" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -39273,16 +39198,6 @@
},
/turf/open/floor/iron/dark/smooth_edge,
/area/station/service/chapel/monastery)
-"hae" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/corner{
- dir = 8
- },
-/area/station/commons/fitness/recreation)
"hav" = (
/obj/machinery/light/small/directional/west,
/obj/item/radio/intercom/directional/west,
@@ -39355,10 +39270,6 @@
/obj/structure/cable,
/turf/open/floor/iron/large,
/area/station/security/brig)
-"hdK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"heD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -39413,6 +39324,14 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"hii" = (
+/obj/effect/turf_decal/tile/red/half,
+/obj/structure/table/wood,
+/obj/machinery/recharger{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/command/heads_quarters/hos)
"hiw" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -39574,6 +39493,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/table,
+/obj/machinery/fax,
/turf/open/floor/iron/corner{
dir = 8
},
@@ -39591,17 +39512,6 @@
dir = 8
},
/area/station/command/bridge)
-"hpt" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/primary/central)
"hqc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -39619,6 +39529,12 @@
},
/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
+"hqp" = (
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"hqI" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/tile/yellow/half{
@@ -40393,8 +40309,8 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
"iaj" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"ibw" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -40774,6 +40690,9 @@
},
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/tile/yellow/half,
+/obj/item/kirbyplants{
+ icon_state = "plant-02"
+ },
/turf/open/floor/iron/edge,
/area/station/engineering/lobby)
"iqN" = (
@@ -41626,7 +41545,7 @@
/area/station/hallway/primary/central)
"jdj" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/holopad,
+/obj/machinery/photocopier,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
"jdr" = (
@@ -41726,6 +41645,11 @@
},
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"jjT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"jkf" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -42192,10 +42116,7 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal)
"jJN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"jKs" = (
/obj/machinery/atmospherics/components/binary/pump{
@@ -42412,10 +42333,9 @@
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/dorms)
"jVS" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- pixel_y = 1
- },
-/turf/open/floor/iron/freezer,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
+/turf/open/floor/iron/white,
/area/station/medical/virology)
"jWj" = (
/obj/structure/cable,
@@ -42885,17 +42805,6 @@
},
/turf/closed/wall/r_wall,
/area/station/maintenance/department/science)
-"krI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/rack,
-/obj/item/storage/box/shipping,
-/obj/effect/turf_decal/trimline/brown/filled/end{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/sorting)
"krP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
@@ -43908,6 +43817,7 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 4
},
+/obj/machinery/photocopier,
/turf/open/floor/iron/edge{
dir = 4
},
@@ -43918,6 +43828,10 @@
},
/turf/open/floor/iron/dark/smooth_half,
/area/station/service/chapel/monastery)
+"lgL" = (
+/obj/structure/transit_tube/station/dispenser/reverse/flipped,
+/turf/open/floor/iron/smooth_large,
+/area/station/hallway/secondary/entry)
"lgR" = (
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/freezer,
@@ -44290,6 +44204,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"lui" = (
+/obj/machinery/photocopier,
+/turf/open/floor/iron/grimy,
+/area/station/security/detectives_office)
"lvq" = (
/turf/closed/wall,
/area/station/security/prison/toilet)
@@ -44372,7 +44290,8 @@
/turf/open/floor/iron/large,
/area/station/hallway/primary/fore)
"lzJ" = (
-/obj/structure/closet/crate/bin,
+/obj/machinery/fax,
+/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/station/service/chapel/office)
"lzP" = (
@@ -44717,6 +44636,17 @@
dir = 1
},
/area/station/security/prison)
+"lPX" = (
+/obj/structure/window/reinforced/spawner/directional/north{
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/structure/transit_tube/station/dispenser/reverse/flipped{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/command/bridge)
"lQn" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
@@ -45119,6 +45049,15 @@
dir = 4
},
/area/station/ai_monitored/command/storage/eva)
+"mgS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/crew_quarters/dorms)
"mgW" = (
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/effect/turf_decal/tile/blue/full,
@@ -45165,6 +45104,11 @@
/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock)
+"mjX" = (
+/obj/structure/cable,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/wood,
+/area/station/maintenance/department/engine)
"mkf" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating/airless,
@@ -45266,11 +45210,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/engineering/engine_smes)
-"mnG" = (
-/obj/effect/spawner/random/maintenance,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/wood,
-/area/station/service/abandoned_gambling_den)
"mnR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/closed/wall/r_wall,
@@ -45317,8 +45256,7 @@
/area/station/medical/medbay/central)
"mpy" = (
/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/blue,
+/obj/machinery/fax/deluxe/starts_enabled,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"mpU" = (
@@ -45498,9 +45436,7 @@
/area/station/tcommsat/computer)
"mxV" = (
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/closet/secure_closet/medical1,
-/obj/effect/turf_decal/tile/green/full,
-/turf/open/floor/iron/white/smooth_large,
+/turf/open/floor/iron/white,
/area/station/medical/virology)
"myc" = (
/obj/structure/cable,
@@ -46090,9 +46026,14 @@
/turf/open/floor/iron/edge,
/area/station/cargo/storage)
"mXq" = (
-/obj/item/taperecorder,
/obj/structure/table/wood,
/obj/machinery/airalarm/directional/south,
+/obj/item/paper_bin,
+/obj/item/pen/blue,
+/obj/item/taperecorder{
+ pixel_x = -9;
+ pixel_y = 7
+ },
/turf/open/floor/wood,
/area/station/service/lawoffice)
"mXI" = (
@@ -46240,18 +46181,6 @@
/obj/structure/rack,
/turf/open/floor/iron/textured_large,
/area/station/cargo/drone_bay)
-"ndt" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
- dir = 4
- },
-/obj/machinery/computer/cargo/request{
- dir = 8
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/primary/central)
"ndx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -46754,6 +46683,13 @@
dir = 8
},
/area/station/security/prison)
+"nuC" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/chair/stool/bar/directional/west,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port)
"nvj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -48402,6 +48338,14 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/white/smooth_large,
/area/station/commons/fitness/recreation)
+"oND" = (
+/obj/machinery/meter,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold/general/visible,
+/obj/machinery/light/small/directional/south,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"oNE" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -49173,6 +49117,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/holopad,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"pqS" = (
@@ -49362,6 +49307,17 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
+"pzD" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"pAb" = (
/obj/machinery/power/emitter,
/obj/machinery/light/directional/west,
@@ -49978,11 +49934,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/library/artgallery)
-"pYj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"pYw" = (
/obj/item/kirbyplants{
icon_state = "plant-03"
@@ -50114,6 +50065,12 @@
dir = 4
},
/area/station/hallway/secondary/entry)
+"qet" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"qeu" = (
/turf/open/floor/iron/dark/smooth_corner,
/area/station/service/chapel/storage)
@@ -50736,6 +50693,12 @@
},
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"qyA" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/service/bar)
"qyR" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -50896,18 +50859,6 @@
dir = 1
},
/area/station/service/chapel/monastery)
-"qGQ" = (
-/obj/structure/table/wood,
-/obj/machinery/fax_machine,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/carpet/royalblack,
-/area/station/security/detectives_office/bridge_officer_office)
"qHa" = (
/obj/structure/closet/wardrobe/red,
/obj/machinery/airalarm/directional/south,
@@ -51789,8 +51740,8 @@
/area/station/service/chapel/office)
"rsd" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/holopad,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"rse" = (
/obj/machinery/power/smes/engineering,
@@ -51996,12 +51947,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/smooth_large,
/area/station/medical/cryo)
-"ryS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"rzp" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
@@ -52118,11 +52063,11 @@
},
/area/station/science/xenobiology)
"rCe" = (
-/obj/structure/table,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
/obj/machinery/newscaster/directional/north,
+/obj/machinery/autolathe,
/turf/open/floor/iron/dark,
/area/station/cargo/office)
"rCg" = (
@@ -52495,6 +52440,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/grass,
/area/station/medical/medbay/central)
+"rOV" = (
+/obj/item/wrench,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/structure/cable,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/cargo)
"rPu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -52935,6 +52889,10 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 4
},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/open/floor/iron/white/smooth_half{
dir = 1
},
@@ -53623,6 +53581,11 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/security/brig)
+"sHp" = (
+/obj/structure/chair/stool/bar/directional/west,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"sHy" = (
/obj/machinery/camera{
c_tag = "Holodeck Control";
@@ -53784,6 +53747,17 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"sPc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/qm)
"sPU" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -53963,6 +53937,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
+"sVS" = (
+/obj/effect/spawner/random/maintenance,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/wood,
+/area/station/service/abandoned_gambling_den)
"sWj" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/caution{
@@ -54026,6 +54005,18 @@
dir = 1
},
/area/station/science/xenobiology)
+"sYf" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ layer = 2.9;
+ pixel_y = 4;
+ pixel_x = 2
+ },
+/obj/item/pen,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/commons/dorms)
"sYi" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -54183,6 +54174,18 @@
/obj/machinery/light/directional/north,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"tbP" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
+ dir = 4
+ },
+/obj/machinery/computer/cargo/request{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/primary/central)
"tbQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -54671,6 +54674,13 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"trv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/structure/flora/bush/lavendergrass/style_random,
+/turf/open/floor/grass,
+/area/station/medical/virology)
"trA" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -55069,15 +55079,6 @@
/obj/effect/turf_decal/tile/neutral/half,
/turf/open/floor/iron/dark/smooth_edge,
/area/station/service/chapel/dock)
-"tDn" = (
-/obj/item/wrench,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/cable,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
"tDz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -55149,12 +55150,6 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
-"tGl" = (
-/obj/item/wrench,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"tHk" = (
/obj/structure/sign/directions/security{
dir = 1;
@@ -56010,12 +56005,18 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/service/library/artgallery)
-"und" = (
-/obj/machinery/door/window/left/directional/east{
- name = "Monkey Pen";
- req_access = list("virology")
+"umQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/effect/turf_decal/tile/red/half,
+/obj/structure/table,
+/turf/open/floor/iron/edge,
+/area/station/security)
+"und" = (
/obj/effect/turf_decal/tile/green/anticorner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
/turf/open/floor/iron/white/smooth_corner{
dir = 1
},
@@ -56239,6 +56240,16 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"uxf" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
+/area/station/commons/fitness/recreation)
"uxj" = (
/obj/machinery/holopad,
/turf/open/floor/iron,
@@ -56390,7 +56401,16 @@
/turf/open/floor/iron/white/side,
/area/station/medical/medbay/lobby)
"uAs" = (
-/turf/open/floor/iron/freezer,
+/mob/living/carbon/human/species/monkey,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
+/obj/machinery/door/window/left/directional/north{
+ name = "Monkey Pen";
+ req_access = list("virology")
+ },
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/floor/grass,
/area/station/medical/virology)
"uAx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -56629,6 +56649,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large,
/area/station/service/library/artgallery)
+"uKs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/transit_tube/station/dispenser/reverse/flipped{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"uKD" = (
/obj/structure/chair,
/obj/machinery/light/directional/north,
@@ -57148,11 +57178,10 @@
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/paramedic)
"vbv" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- pixel_y = 1
- },
-/mob/living/carbon/human/species/monkey,
-/turf/open/floor/iron/freezer,
+/obj/structure/table/glass,
+/obj/machinery/fax,
+/obj/effect/turf_decal/tile/green/full,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"vbF" = (
/obj/item/radio/intercom/directional/west,
@@ -57241,13 +57270,11 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"vfw" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/effect/turf_decal/tile/blue/anticorner{
dir = 8
},
+/obj/machinery/fax,
+/obj/structure/table/glass,
/turf/open/floor/iron/white/smooth_corner{
dir = 4
},
@@ -57289,7 +57316,6 @@
/area/station/hallway/primary/central)
"vgA" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/green{
dir = 4
},
@@ -57361,6 +57387,14 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"vji" = (
+/obj/item/stack/spacecash/c10,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/department/engine)
"vjH" = (
/obj/structure/reagent_dispensers/fueltank/large,
/obj/effect/turf_decal/tile/yellow/half,
@@ -58277,8 +58311,6 @@
/area/station/engineering/atmos)
"vXd" = (
/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -58289,6 +58321,16 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/item/clipboard{
+ pixel_y = 2;
+ pixel_x = 5
+ },
+/obj/item/paper_bin,
+/obj/item/folder{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/pen,
/turf/open/floor/iron,
/area/station/science/breakroom)
"vXt" = (
@@ -58321,7 +58363,6 @@
name = "science camera";
network = list("ss13","rd")
},
-/obj/structure/sign/poster/official/report_crimes/directional/north,
/obj/machinery/microwave{
desc = "Cooks and boils stuff, somehow.";
pixel_x = -3;
@@ -58338,6 +58379,7 @@
dir = 1
},
/obj/machinery/newscaster/directional/east,
+/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
/area/station/science/breakroom)
"vYN" = (
@@ -58477,6 +58519,14 @@
dir = 8
},
/area/station/security/brig)
+"wco" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security/brig)
"wcP" = (
/obj/structure/chair{
dir = 4
@@ -58760,10 +58810,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos)
-"wmC" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"wmE" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -58979,6 +59025,7 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"wwE" = (
+/obj/structure/table,
/turf/open/floor/iron/edge{
dir = 4
},
@@ -59144,6 +59191,10 @@
dir = 8
},
/area/station/command/gateway)
+"wBx" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security/brig)
"wBO" = (
/obj/item/toy/crayon/spraycan{
pixel_x = 4;
@@ -59359,6 +59410,8 @@
"wGM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/wood,
+/obj/machinery/fax,
+/obj/structure/table/wood,
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
"wHD" = (
@@ -59915,11 +59968,6 @@
dir = 1
},
/area/station/security/brig)
-"wXP" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"wYi" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
dir = 4
@@ -60500,6 +60548,17 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"xoE" = (
+/obj/structure/table,
+/obj/item/storage/wallet,
+/obj/item/storage/wallet{
+ pixel_y = 3;
+ pixel_x = 2
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/commons/dorms)
"xoM" = (
/obj/structure/closet/crate/engineering,
/obj/item/stack/sheet/glass/fifty,
@@ -60868,15 +60927,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal)
-"xFA" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/plating,
-/area/station/maintenance/department/crew_quarters/dorms)
"xFF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
@@ -61089,6 +61139,14 @@
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron/smooth_large,
/area/station/service/library/artgallery)
+"xNs" = (
+/mob/living/carbon/human/species/monkey,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/flora/bush/lavendergrass/style_random,
+/turf/open/floor/grass,
+/area/station/medical/virology)
"xNx" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/junction/flip,
@@ -76751,7 +76809,7 @@ wYu
ajD
ajD
ajD
-cYY
+wBx
mwg
aiu
aht
@@ -77337,7 +77395,7 @@ bHL
bKe
sBk
bMw
-bNx
+eNM
bNw
bOw
bOw
@@ -78297,7 +78355,7 @@ aoK
aiu
azY
aiu
-ayB
+nuC
vtT
aAX
axC
@@ -78538,7 +78596,7 @@ aaa
aaa
aiu
aiX
-cYY
+wBx
aks
aiu
ait
@@ -79319,7 +79377,7 @@ aof
aiu
aqh
lqc
-gPY
+wco
atq
aut
aiu
@@ -82227,7 +82285,7 @@ kjI
bJg
bKl
kww
-bMC
+vji
eHb
bHQ
bPq
@@ -83234,7 +83292,7 @@ bzA
bAK
bBX
bDg
-bEk
+oND
bva
bva
xtI
@@ -83259,7 +83317,7 @@ hiU
iVT
bva
mNv
-ryS
+qet
uqf
ouv
crm
@@ -83488,7 +83546,7 @@ sVj
bwr
bya
bzB
-bAL
+lgL
bBX
bDh
bEl
@@ -83955,7 +84013,7 @@ mCg
qNG
ioZ
aBe
-aCl
+lui
aDq
aEn
aFp
@@ -84469,7 +84527,7 @@ qAF
qNG
ioZ
aBe
-aCm
+aCl
aCl
aEp
hUx
@@ -84525,9 +84583,9 @@ sSl
bHS
bEr
wLl
+jJN
+eCm
stc
-cis
-hdK
gVn
ggW
lkK
@@ -84786,8 +84844,8 @@ xIw
xUV
fMe
und
-bKn
-bKn
+bEr
+bEr
bEr
bEr
bEr
@@ -85286,7 +85344,7 @@ tqC
rMZ
bye
vOB
-bzF
+fDf
bAP
vfw
tqC
@@ -85300,8 +85358,8 @@ bEr
bEr
ozc
vbv
-uAs
-bFI
+trv
+xNs
bFL
bEr
aaa
@@ -85312,7 +85370,7 @@ bDi
bva
rXJ
bTg
-tGl
+hqp
jYh
bVv
bva
@@ -85543,7 +85601,7 @@ tqC
feU
bwv
bAQ
-bzG
+fDf
bye
bBZ
tqC
@@ -85558,7 +85616,7 @@ bEr
bEr
bEr
bEr
-bEr
+bOD
bEr
bEr
bJj
@@ -85800,7 +85858,7 @@ tqC
tqC
bwx
bye
-bzG
+fDf
uCe
bCa
tqC
@@ -86100,7 +86158,7 @@ rle
bNU
nYb
dSr
-gLZ
+mjX
dJm
kev
wfO
@@ -86255,7 +86313,7 @@ anM
anc
xGN
tLA
-apb
+umQ
agQ
faT
vao
@@ -86343,7 +86401,7 @@ xwC
ewb
bva
bPA
-wXP
+dxd
bSw
bXV
bDi
@@ -86853,7 +86911,7 @@ xbD
bDi
bva
nGx
-bPC
+sHp
bUc
bva
bva
@@ -88848,7 +88906,7 @@ gNG
ble
aJM
aKQ
-aLE
+ehL
aNc
aKT
aLL
@@ -89333,7 +89391,7 @@ aaa
abI
ajs
ake
-akX
+hii
alM
amz
ank
@@ -89856,7 +89914,7 @@ aoz
apn
aoz
aqG
-arC
+lPX
asO
atM
sQx
@@ -91424,7 +91482,7 @@ bgr
mUt
mUt
aRP
-aSM
+aUb
aUb
aVc
aWb
@@ -92452,7 +92510,7 @@ coH
aKT
aQU
rPY
-dGO
+qyA
tki
qaQ
aWf
@@ -94999,7 +95057,7 @@ aaa
aaa
oAS
tPn
-qGQ
+cUF
gRF
axh
aZA
@@ -95490,7 +95548,7 @@ acU
afi
acU
afR
-agh
+uKs
agu
agE
agS
@@ -98876,8 +98934,8 @@ iKb
dMB
lAs
bdR
-ndt
-hpt
+tbP
+pzD
aOT
uZJ
php
@@ -99095,7 +99153,7 @@ jHP
aju
ajt
alQ
-mnG
+sVS
xjl
otM
aJc
@@ -99357,7 +99415,7 @@ qxE
stG
anm
sFK
-xFA
+mgS
uGx
sFK
cBA
@@ -100169,7 +100227,7 @@ pvZ
xmQ
lct
mIS
-krI
+aZn
bbC
lQr
lru
@@ -101701,7 +101759,7 @@ aEj
uXX
aNO
ofj
-ofj
+sPc
aSj
ofj
vgR
@@ -101940,10 +101998,10 @@ atn
atn
jNg
hoj
-wwE
+sYf
tMV
fYf
-wwE
+xoE
wwE
aDk
aEd
@@ -104519,7 +104577,7 @@ aur
aur
atn
aFO
-aGL
+fXo
aHt
aEj
tfz
@@ -106823,7 +106881,7 @@ sFK
sFK
sFK
asc
-hae
+uxf
lhO
cgB
hju
@@ -107857,7 +107915,7 @@ aaa
aaa
aaa
aIp
-aJq
+dAA
aFj
aMr
aIp
@@ -107915,7 +107973,7 @@ izF
mES
lWy
lWy
-wmC
+gop
lWy
bwm
aaa
@@ -108141,7 +108199,7 @@ aaa
aaa
aEj
eZA
-tDn
+rOV
dTR
nZw
dTR
@@ -111237,7 +111295,7 @@ cJo
qJB
ops
iSi
-pYj
+jjT
faA
qYn
jYN
diff --git a/code/datums/wires/fax.dm b/code/datums/wires/fax.dm
index 3a0193e5a4c2..c8b7311e6f3d 100644
--- a/code/datums/wires/fax.dm
+++ b/code/datums/wires/fax.dm
@@ -1,3 +1,7 @@
+/*
+
+// NON-MODULE CHANGE: Assuming direct control of fax economy
+
/datum/wires/fax
holder_type = /obj/machinery/fax
proper_name = "Fax Unit"
@@ -49,3 +53,4 @@
machine.hurl_contents = !mend
if(WIRE_LOADCHECK)
machine.allow_exotic_faxes = !mend
+*/
diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm
index e4126d89c5da..db27f535f0ae 100644
--- a/code/modules/admin/admin_fax_panel.dm
+++ b/code/modules/admin/admin_fax_panel.dm
@@ -28,7 +28,7 @@
/datum/fax_panel_interface/New()
//Get all faxes, and save them to our list.
- for(var/obj/machinery/fax/fax in GLOB.machines)
+ for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines) // NON-MODULE CHANGE
available_faxes += WEAKREF(fax)
//Get all stamps
@@ -52,9 +52,10 @@
for(var/datum/weakref/weakrefed_fax as anything in available_faxes)
var/obj/machinery/fax/potential_fax = weakrefed_fax.resolve()
- if(potential_fax && istype(potential_fax))
- if(potential_fax.fax_name == name)
- return potential_fax
+ // NON-MODULE CHANGE START
+ if(istype(potential_fax) && potential_fax.room_tag == name)
+ return potential_fax
+ // NON-MODULE CHANGE END
return null
/datum/fax_panel_interface/ui_interact(mob/user, datum/tgui/ui)
@@ -77,8 +78,10 @@
for(var/datum/weakref/weakrefed_fax as anything in available_faxes)
var/obj/machinery/fax/another_fax = weakrefed_fax.resolve()
- if(another_fax && istype(another_fax))
- data["faxes"] += list(another_fax.fax_name)
+ // NON-MODULE CHANGE START
+ if(istype(another_fax))
+ data["faxes"] += list(another_fax.room_tag)
+ // NON-MODULE CHANGE END
return data
@@ -136,7 +139,7 @@
var/obj/item/paper/our_fax = fax_paper.copy(/obj/item/paper)
our_fax.name = fax_paper.name
//send
- action_fax.receive(our_fax, sending_fax_name)
+ action_fax.receive_paper(our_fax, sending_fax_name) // NON-MODULE CHANGE
message_admins("[key_name_admin(usr)] has sent a custom fax message to [action_fax.name][ADMIN_FLW(action_fax)][ADMIN_SHOW_PAPER(fax_paper)].")
log_admin("[key_name(usr)] has sent a custom fax message to [action_fax.name]")
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index f871f94bf920..3df95a41009d 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -1,3 +1,7 @@
+/*
+
+// NON-MODULE CHANGE: Assuming direct control of fax economy
+
GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department", "NT Complaint Department", "NT Customer Relations", "Nanotrasen Tech Support", "NT Internal Affairs Dept"))
/obj/machinery/fax
@@ -83,7 +87,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
if(jammed)
. += span_notice("Its output port is jammed and needs cleaning.")
-
/obj/machinery/fax/on_set_is_operational(old_value)
if (old_value == FALSE)
START_PROCESSING(SSmachines, src)
@@ -376,6 +379,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
icon_state = "fax"
overlays -= remove_overlay
+*/
/**
* Returns an appropriate icon state to represent a passed item.
* Arguments:
@@ -401,6 +405,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
return "[state_prefix]_pbiscuit"
return "[state_prefix]_paper"
+/*
/**
* Actually vends an item out of the fax machine.
* Moved into its own proc to allow a delay for the animation.
@@ -416,6 +421,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
do_sparks(5, TRUE, src)
jammed = TRUE
+*/
/**
* A procedure that makes entries in the history of fax transactions.
*
@@ -430,12 +436,14 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
history_data["history_type"] = history_type
history_data["history_fax_name"] = history_fax_name
history_data["history_time"] = station_time_timestamp()
+ history_data["iterator"] = length(fax_history) + 1 // NON-MODULE CHANGE
fax_history += list(history_data)
/// Clears the history of fax operations.
/obj/machinery/fax/proc/history_clear()
fax_history = null
+/*
/**
* Checks fax names for a match.
*
@@ -465,7 +473,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
var/check_range = TRUE
return electrocute_mob(user, get_area(src), src, 0.7, check_range)
-
/obj/machinery/fax/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
if (!held_item)
@@ -515,4 +522,4 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
return CONTEXTUAL_SCREENTIP_SET
return .
-
+*/
diff --git a/maplestation_modules/code/controllers/subsystem/economy.dm b/maplestation_modules/code/controllers/subsystem/economy.dm
index 2cadc2a24959..e732e0c52fb5 100644
--- a/maplestation_modules/code/controllers/subsystem/economy.dm
+++ b/maplestation_modules/code/controllers/subsystem/economy.dm
@@ -14,18 +14,19 @@
*/
/datum/controller/subsystem/economy/proc/send_fax_paperwork()
var/list/area/processed_areas = list()
- for(var/obj/machinery/fax_machine/found_machine as anything in GLOB.fax_machines)
- /// We only send to one fax machine in an area
+ for(var/obj/machinery/fax/found_machine as anything in GLOB.fax_machines)
+ // We only send to one fax machine in an area
var/area/area_loc = get_area(found_machine)
- if(area_loc in processed_areas)
+ if(isnull(area_loc) || processed_areas[area_loc.type])
continue
- processed_areas += area_loc
+ processed_areas[area_loc.type] = TRUE
if(LAZYLEN(found_machine.received_paperwork) >= found_machine.max_paperwork)
continue
if(!found_machine.can_receive_paperwork)
continue
-
+ if((found_machine.machine_stat & (NOPOWER|BROKEN)) && !(found_machine.interaction_flags_machine & INTERACT_MACHINE_OFFLINE))
+ continue
var/num_papers_added = 0
for(var/i in 1 to rand(0, 4))
if(LAZYLEN(found_machine.received_paperwork) >= found_machine.max_paperwork)
@@ -42,7 +43,7 @@
*
* return an instance of [/obj/item/paper/processed].
*/
-/proc/generate_paperwork(obj/machinery/fax_machine/destination_machine)
+/proc/generate_paperwork(obj/machinery/fax/destination_machine)
// Percent chance this paper will contain an error, somewhere.
var/error_prob = prob(8)
// Percent change that something will be redacted from the paper.
@@ -104,7 +105,8 @@
"lizard" = random_unique_lizard_name(),
"plasmaman" = random_unique_plasmaman_name(),
"ethereal" = random_unique_ethereal_name(),
- "moth" = random_unique_moth_name(),)
+ "moth" = random_unique_moth_name(),
+ )
paper_victim_species = pick(possible_names)
paper_victim = possible_names[paper_victim_species]
all_tracked_data += "victim"
diff --git a/maplestation_modules/code/game/machinery/fax_machine.dm b/maplestation_modules/code/game/machinery/fax_machine.dm
index 26437137294b..adbb9804679d 100644
--- a/maplestation_modules/code/game/machinery/fax_machine.dm
+++ b/maplestation_modules/code/game/machinery/fax_machine.dm
@@ -13,49 +13,46 @@ GLOBAL_LIST_EMPTY(fax_machines)
/// The max amount of chars displayed in a fax message in the UI
#define MAX_DISPLAYED_PAPER_CHARS 475
-/// Wire IDs for the fax machine
-#define WIRE_SEND_FAXES "Send wire"
-#define WIRE_RECEIVE_FAXES "Receive wire"
-#define WIRE_PAPERWORK "Paperwork wire"
-
-/// VV dropdowns for the fax machine
-#define VV_SEND_FAX "send_fax"
-#define VV_SEND_MARKED_FAX "send_marked_fax"
-
/// Fax machine design, for techwebs.
-/datum/design/board/fax_machine
- name = "Machine Design (Fax Machine Board)"
- desc = "The circuit board for a Fax Machine."
- id = "fax_machine"
- build_path = /obj/item/circuitboard/machine/fax_machine
- category = list("Misc. Machinery")
- departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_CARGO
+/datum/design/board/fax/deluxe
+ name = "Machine Design (Deluxe Fax Machine Board)"
+ desc = "The circuit board for a Deluxe Fax Machine. \
+ Unlike normal fax machines, this one can receive paperwork to process."
+ id = "fax_machine_deluxe"
+ build_path = /obj/item/circuitboard/machine/fax/deluxe
/// Fax machine circuit.
-/obj/item/circuitboard/machine/fax_machine
- name = "Fax Machine (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_COMMAND
- build_path = /obj/machinery/fax_machine
- req_components = list(
- /obj/item/stack/sheet/mineral/silver = 1,
- /obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/micro_laser = 1,
- )
+/obj/item/circuitboard/machine/fax/deluxe
+ name = "Deluxe Fax Machine (Machine Board)"
+ build_path = /obj/machinery/fax/deluxe
+
+/obj/item/circuitboard/machine/fax/deluxe/Initialize(mapload)
+ . = ..()
+ req_components[/obj/item/stack/sheet/mineral/silver] = 2
+ req_components[/obj/item/stack/sheet/glass] = 1
/// Fax machine. Sends messages, receives messages, sends paperwork, receives paperwork.
-/obj/machinery/fax_machine
+/obj/machinery/fax
name = "fax machine"
- desc = "A machine made to send faxes and process paperwork. You unbelievably boring person."
- icon = 'maplestation_modules/icons/obj/machines/fax.dmi'
+ desc = "A machine made to send copies of papers to other departments or Central Command. Bureaucratic."
+ icon = 'icons/obj/fax.dmi'
base_icon_state = "fax"
icon_state = "fax"
+ max_integrity = 100
+ pass_flags = PASSTABLE
speech_span = SPAN_ROBOT
density = TRUE
use_power = IDLE_POWER_USE
- idle_power_usage = 10
- active_power_usage = 100
- req_one_access = list(ACCESS_COMMAND, ACCESS_LAWYER)
- circuit = /obj/item/circuitboard/machine/fax_machine
+ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.1
+ req_one_access = list(ACCESS_COMMAND, ACCESS_LAWYER) // for unlocking the panel
+ circuit = /obj/item/circuitboard/machine/fax
+
+ // Inherited from /tg/ fax code
+ var/fax_name
+ var/list/fax_history = list()
+
+ // Original fax code
/// Whether this machine can send faxes
var/sending_enabled = TRUE
/// Whether this machine can receive faxes
@@ -63,120 +60,139 @@ GLOBAL_LIST_EMPTY(fax_machines)
/// Whether this fax machine is locked.
var/locked = TRUE
/// Whether this fax machine can receive paperwork to process on SSeconomy ticks.
- var/can_receive_paperwork = TRUE
+ var/can_receive_paperwork = FALSE
+ /// Whether this fax can toggle paperwork on or off
+ var/is_allowed_to_toggle_paperwork = FALSE
/// Whether we have an unread message
- var/unread_message = FALSE
+ VAR_FINAL/unread_message = FALSE
/// The area string this fax machine is set to.
- var/room_tag
+ VAR_FINAL/room_tag
/// The paper stored that we can send to admins. Reference to something in our contents.
- var/obj/item/paper/stored_paper
+ VAR_FINAL/obj/item/paper/stored_paper
/// The paper received that was sent FROM admins. Reference to something in our contents.
- var/obj/item/paper/received_paper
- /// List of all paperwork we have in this fax machine. List of references to things in our contents.
- var/list/obj/item/paper/processed/received_paperwork
+ VAR_FINAL/obj/item/paper/received_paper
+ /// Lazylist of all paperwork we have in this fax machine. List of references to things in our contents.
+ VAR_FINAL/list/obj/item/paper/processed/received_paperwork
/// Max amount of paperwork we can hold. Any more and the UI gets less readable.
var/max_paperwork = 8
/// Cooldown between sending faxes
COOLDOWN_DECLARE(fax_cooldown)
-/obj/machinery/fax_machine/Initialize(mapload)
+/obj/machinery/fax/Initialize(mapload)
. = ..()
GLOB.fax_machines += src
- set_room_tag(TRUE)
- wires = new /datum/wires/fax2(src)
+ set_room_tag(TRUE, !mapload)
+ wires = new /datum/wires/fax(src)
-/obj/machinery/fax_machine/Destroy()
+/obj/machinery/fax/Destroy()
QDEL_NULL(stored_paper)
QDEL_NULL(received_paper)
- QDEL_LIST(received_paperwork)
-
+ QDEL_LAZYLIST(received_paperwork)
GLOB.fax_machines -= src
return ..()
-/obj/machinery/fax_machine/on_deconstruction()
- eject_stored_paper()
+/obj/machinery/fax/on_deconstruction()
+ var/atom/droploc = drop_location()
+ stored_paper.forceMove(droploc)
+ received_paper.forceMove(droploc)
eject_all_paperwork()
- eject_received_paper()
-
return ..()
-/obj/machinery/fax_machine/recieving_disabled
- can_receive_paperwork = FALSE
+/obj/machinery/fax/deluxe
+ name = "deluxe fax machine"
+ desc = "A deluxe fax machine, designed not only to send and receive faxes, but to process an unending stream of paperwork. \
+ You unbelievably boring person."
+ is_allowed_to_toggle_paperwork = TRUE
+ circuit = /obj/item/circuitboard/machine/fax/deluxe
+
+/obj/machinery/fax/deluxe/starts_enabled
+ can_receive_paperwork = TRUE
-/obj/machinery/fax_machine/full/Initialize(mapload)
+/obj/machinery/fax/deluxe/full
+ can_receive_paperwork = TRUE
+
+/obj/machinery/fax/deluxe/full/Initialize(mapload)
. = ..()
for(var/i in 1 to max_paperwork)
- if(LAZYLEN(received_paperwork) >= max_paperwork)
- continue
LAZYADD(received_paperwork, generate_paperwork(src))
-/obj/machinery/fax_machine/ui_interact(mob/user, datum/tgui/ui)
+/obj/machinery/fax/ui_interact(mob/user, datum/tgui/ui)
. = ..()
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "_FaxMachine", name)
ui.open()
-/obj/machinery/fax_machine/ui_state(mob/user)
+/obj/machinery/fax/ui_state(mob/user)
if(!anchored)
return UI_DISABLED
+ if(panel_open)
+ return UI_UPDATE
return GLOB.physical_state
-/obj/machinery/fax_machine/ui_data(mob/user)
+/obj/machinery/fax/ui_data(mob/user)
var/list/data = list()
var/emagged = obj_flags & EMAGGED
- var/list/all_received_paperwork = list()
+
+ data["received_paperwork"] = list()
var/iterator = 1
for(var/obj/item/paper/processed/paper as anything in received_paperwork)
var/list/found_paper_data = list()
found_paper_data["title"] = paper.name
- found_paper_data["contents"] = TextPreview(remove_all_tags(paper.get_raw_text()), MAX_DISPLAYED_PAPER_CHARS)
+ found_paper_data["contents"] = raw_paper_text_to_ui_text(paper)
found_paper_data["required_answer"] = paper.required_question
found_paper_data["ref"] = REF(paper)
found_paper_data["num"] = iterator++
- all_received_paperwork += list(found_paper_data)
- if(all_received_paperwork.len)
- data["received_paperwork"] = all_received_paperwork
+ UNTYPED_LIST_ADD(data["received_paperwork"], found_paper_data)
if(stored_paper)
- var/list/stored_paper_data = list()
- stored_paper_data["title"] = stored_paper.name
- stored_paper_data["contents"] = TextPreview(remove_all_tags(stored_paper.get_raw_text()), MAX_DISPLAYED_PAPER_CHARS)
- stored_paper_data["ref"] = REF(stored_paper_data)
- data["stored_paper"] = stored_paper_data
+ data["stored_paper"] = list(
+ "title" = stored_paper.name,
+ "contents" = raw_paper_text_to_ui_text(stored_paper),
+ "ref" = REF(stored_paper),
+ )
if(received_paper)
- var/list/received_paper_data = list()
- received_paper_data["title"] = received_paper.name
- received_paper_data["contents"] = TextPreview(remove_all_tags(received_paper.get_raw_text()), MAX_DISPLAYED_PAPER_CHARS)
- received_paper_data["source"] = received_paper.was_faxed_from
- received_paper_data["ref"] = REF(received_paper)
- data["received_paper"] = received_paper_data
+ data["received_paper"] = list(
+ "title" = received_paper.name,
+ "contents" = raw_paper_text_to_ui_text(received_paper),
+ "source" = received_paper.was_faxed_from,
+ "ref" = REF(received_paper),
+ )
+ data["display_name"] = "\[REDACTED\]"
if(emagged)
var/emagged_text = ""
for(var/i in 1 to rand(4, 7))
emagged_text += pick("!","@","#","$","%","^","&")
data["display_name"] = emagged_text
+
else if(ishuman(user))
var/mob/living/carbon/human/human_user = user
- var/obj/item/card/id/our_id = human_user.wear_id?.GetID()
- data["display_name"] = our_id?.registered_name || "\[REDACTED\]"
+ var/obj/item/card/id/our_id = human_user.get_idcard()
+ if(our_id?.registered_name)
+ data["display_name"] = our_id?.registered_name
+
else if(issilicon(user))
data["display_name"] = user.real_name
- else
- data["display_name"] = "\[REDACTED\]"
- data["can_send_cc_messages"] = (allowed(user) || emagged) && COOLDOWN_FINISHED(src, fax_cooldown)
+ data["history"] = fax_history
+ data["can_send"] = COOLDOWN_FINISHED(src, fax_cooldown)
data["can_receive"] = can_receive_paperwork
+ data["can_toggle_can_receive"] = is_allowed_to_toggle_paperwork
data["emagged"] = emagged
data["unread_message"] = unread_message
- var/admin_destination = (emagged ? SYNDICATE_FAX_MACHINE : CENTCOM_FAX_MACHINE)
+ return data
+
+/obj/machinery/fax/ui_static_data(mob/user)
+ var/list/data = list()
+
+ var/admin_destination = (obj_flags & EMAGGED) ? SYNDICATE_FAX_MACHINE : CENTCOM_FAX_MACHINE
var/list/possible_destinations = list()
possible_destinations += admin_destination
- for(var/obj/machinery/fax_machine/machine as anything in GLOB.fax_machines)
+ for(var/obj/machinery/fax/machine as anything in GLOB.fax_machines)
if(machine == src)
continue
if(!machine.room_tag)
@@ -189,18 +205,20 @@ GLOBAL_LIST_EMPTY(fax_machines)
return data
-/obj/machinery/fax_machine/ui_act(action, list/params)
+/obj/machinery/fax/ui_act(action, list/params)
. = ..()
if(.)
return
switch(action)
if("un_emag_machine")
- to_chat(usr, span_notice("You restore [src]'s routing information to [CENTCOM_FAX_MACHINE]."))
+ balloon_alert(usr, "routing information restored")
obj_flags &= ~EMAGGED
+ update_static_data_for_all_viewers()
if("toggle_recieving")
- can_receive_paperwork = !can_receive_paperwork
+ if(is_allowed_to_toggle_paperwork)
+ can_receive_paperwork = !can_receive_paperwork
if("read_last_received")
unread_message = FALSE
@@ -209,7 +227,14 @@ GLOBAL_LIST_EMPTY(fax_machines)
send_stored_paper(usr, params["destination_machine"])
if("print_received_paper")
- eject_received_paper(usr, FALSE)
+ flick("[base_icon_state]_receive", src)
+ flick_overlay_view(find_overlay_state(received_paper, "receive"), 2 SECONDS)
+ balloon_alert(usr, "removed paper")
+ playsound(src, 'sound/machines/printer.ogg', 50, TRUE)
+ if(usr.CanReach(src))
+ usr.put_in_hands(received_paper)
+ else
+ received_paper.forceMove(drop_location())
if("print_all_paperwork")
eject_all_paperwork_with_delay(usr)
@@ -220,7 +245,8 @@ GLOBAL_LIST_EMPTY(fax_machines)
if("delete_select_paperwork")
var/obj/item/paper/processed/paper = locate(params["ref"]) in received_paperwork
- delete_select_paperwork(paper)
+ qdel(paper)
+ use_power(active_power_usage)
if("check_paper")
var/obj/item/paper/processed/paper = locate(params["ref"]) in received_paperwork
@@ -228,43 +254,60 @@ GLOBAL_LIST_EMPTY(fax_machines)
return TRUE
-/obj/machinery/fax_machine/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver)
- var/is_user_robot = issilicon(user)
- if(!panel_open && locked && !is_user_robot)
+/obj/machinery/fax/update_overlays()
+ . = ..()
+ if (panel_open)
+ . += "fax_panel"
+ if (stored_paper)
+ . += mutable_appearance(icon, find_overlay_state(stored_paper, "contain"))
+
+/obj/machinery/fax/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver)
+ if(locked && !panel_open)
+ if(issilicon(user))
+ balloon_alert(user, "panel lock bypassed")
+ return ..()
+
balloon_alert(user, "panel locked!")
return FALSE
- . = ..()
- if(. && panel_open && locked && is_user_robot)
- balloon_alert(user, "panel lock bypassed")
+ return ..()
-/obj/machinery/fax_machine/can_be_unfasten_wrench(mob/user, silent)
+/obj/machinery/fax/can_be_unfasten_wrench(mob/user, silent)
if(!panel_open)
if(!silent)
- to_chat(user, span_warning("You need to open the maintenance panel to access the bolts!"))
+ balloon_alert(user, "open the panel first!")
return FAILED_UNFASTEN // "failed" instead of "cant", because failed stops afterattacks
return ..()
-/obj/machinery/fax_machine/default_unfasten_wrench(mob/user, obj/item/wrench, time = 20)
+/obj/machinery/fax/default_unfasten_wrench(mob/user, obj/item/wrench, time = 20)
. = ..()
- if(. == SUCCESSFUL_UNFASTEN)
- set_room_tag(anchored) // Sets the room tag to NULL if unanchored, or the area name if anchored
-
-/obj/machinery/fax_machine/attackby(obj/item/weapon, mob/user, params)
- if(!isliving(user))
- return ..()
-
- if(weapon.tool_behaviour == TOOL_SCREWDRIVER)
- if(default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", initial(icon_state), weapon))
- update_appearance()
- return TRUE
-
- if(default_deconstruction_crowbar(weapon))
- return TRUE
-
- if(default_unfasten_wrench(user, weapon, 3 SECONDS))
- return TRUE
-
+ if(. != SUCCESSFUL_UNFASTEN)
+ return .
+
+ set_room_tag(anchored, TRUE) // Sets the room tag to NULL if unanchored, or the area name if anchored
+ return .
+
+/obj/machinery/fax/screwdriver_act(mob/living/user, obj/item/screwdriver)
+ if(default_deconstruction_screwdriver(user, base_icon_state, base_icon_state, screwdriver))
+ update_appearance()
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+ return NONE
+
+/obj/machinery/fax/wrench_act(mob/living/user, obj/item/tool)
+ switch(default_unfasten_wrench(user, tool))
+ if(CANT_UNFASTEN)
+ return NONE
+ if(FAILED_UNFASTEN)
+ return TOOL_ACT_SIGNAL_BLOCKING
+ if(SUCCESSFUL_UNFASTEN)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+ return NONE
+
+/obj/machinery/fax/crowbar_act(mob/living/user, obj/item/tool)
+ return default_deconstruction_crowbar(tool) ? TOOL_ACT_TOOLTYPE_SUCCESS : NONE
+
+/obj/machinery/fax/attackby(obj/item/weapon, mob/user, params)
+ // This is to catch assemblies
if(panel_open && is_wire_tool(weapon))
wires.interact(user)
return TRUE
@@ -273,50 +316,66 @@ GLOBAL_LIST_EMPTY(fax_machines)
insert_processed_paper(weapon, user)
return TRUE
- else if(istype(weapon, /obj/item/paper))
+ if(istype(weapon, /obj/item/paper))
var/obj/item/paper/inserted_paper = weapon
if(inserted_paper.was_faxed_from in GLOB.admin_fax_destinations)
- to_chat(user, span_warning("Papers from [inserted_paper.was_faxed_from] cannot be re-faxed."))
- return TRUE
- else
- insert_paper(inserted_paper, user)
+ balloon_alert(user, "cannot re-fax!")
return TRUE
+ insert_paper(inserted_paper, user)
+ return TRUE
- if(weapon.GetID())
- if(check_access(weapon.GetID()) && !panel_open)
- locked = !locked
- playsound(src, 'sound/machines/terminal_eject.ogg', 30, FALSE)
- balloon_alert(user, "panel [locked ? "locked" : "unlocked"]")
- return TRUE
+ if(check_access(weapon.GetID()) && !panel_open)
+ locked = !locked
+ playsound(src, 'sound/machines/terminal_eject.ogg', 30, FALSE)
+ balloon_alert(user, "panel [locked ? "locked" : "unlocked"]")
+ return TRUE
return ..()
-/obj/machinery/fax_machine/attack_hand(mob/user, list/modifiers)
- if(LAZYACCESS(modifiers, RIGHT_CLICK))
- eject_stored_paper(user, FALSE)
- return TRUE
- return ..()
+/obj/machinery/fax/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return .
+ if(isnull(stored_paper))
+ return SECONDARY_ATTACK_CALL_NORMAL
-/obj/machinery/fax_machine/examine(mob/user)
+ balloon_alert(user, "removed paper")
+ if(user.CanReach(src))
+ user.put_in_hands(stored_paper)
+ else
+ stored_paper.forceMove(drop_location())
+
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/fax/examine(mob/user)
. = ..()
+ . += span_notice("Its maintenance panel is [locked ? "locked" : "unlocked"][panel_open ? ", and open" : ""].")
if(stored_paper)
- . += span_notice("Right click to remove the stored fax.")
- . += span_notice("The maintenance panel is [locked ? "locked" : "unlocked"]. Swipe your ID card to [locked ? "unlock" : "lock"] it.")
+ . += span_notice("It has a paper in its tray, ready to send somewhere.")
+ if(received_paper)
+ . += span_notice("Looks like it's received a fax.")
/**
* Set this fax machine's [room_tag] to the current room or null.
*
* if to_curr_room is TRUE, sets the room_tag to the current area's name.
* otherwise, sets it to null.
+ *
+ * if update_all_faxes is TRUE, updates all fax machines in the world.
*/
-/obj/machinery/fax_machine/proc/set_room_tag(to_curr_room = TRUE)
+/obj/machinery/fax/proc/set_room_tag(to_curr_room = TRUE, update_all_faxes = FALSE)
if(to_curr_room)
room_tag = get_area_name(src, TRUE) // no proper or improper tags on this
- name = "[get_area_name(src, FALSE)] [name]"
+ if(name == initial(name))
+ name = "[fax_name || get_area_name(src, FALSE)] [name]"
else
room_tag = null
name = initial(name)
+ if(update_all_faxes)
+ for(var/obj/machinery/fax/other_fax as anything in GLOB.fax_machines)
+ other_fax.update_static_data_for_all_viewers()
+
/**
* Send [stored_paper] from [user] to [destinatoin].
* if [destination] is an admin fax machine, send it to admins.
@@ -324,17 +383,17 @@ GLOBAL_LIST_EMPTY(fax_machines)
*
* returns TRUE if the fax was sent.
*/
-/obj/machinery/fax_machine/proc/send_stored_paper(mob/living/user, destination)
+/obj/machinery/fax/proc/send_stored_paper(mob/living/user, destination)
if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE))
return FALSE
if(!sending_enabled)
- balloon_alert_to_viewers("can't send faxes!")
+ balloon_alert(user, "can't send faxes!")
playsound(src, 'sound/machines/terminal_error.ogg', 50, FALSE)
return FALSE
- if(!stored_paper || !length(stored_paper.get_raw_text()) || !COOLDOWN_FINISHED(src, fax_cooldown))
- balloon_alert_to_viewers("fax failed to send!")
+ if(!length(stored_paper?.get_raw_text()) || !COOLDOWN_FINISHED(src, fax_cooldown))
+ balloon_alert(user, "fax failed to send!")
playsound(src, 'sound/machines/terminal_error.ogg', 50, FALSE)
return FALSE
@@ -346,7 +405,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
send_fax_to_admins(user, message, ((obj_flags & EMAGGED) ? "crimson" : "orange"), destination)
else
var/found_a_machine = FALSE
- for(var/obj/machinery/fax_machine/machine as anything in GLOB.fax_machines)
+ for(var/obj/machinery/fax/machine as anything in GLOB.fax_machines)
if(machine == src || machine.room_tag == room_tag)
continue
if(!machine.room_tag)
@@ -356,17 +415,35 @@ GLOBAL_LIST_EMPTY(fax_machines)
found_a_machine = TRUE
break
if(!found_a_machine)
- balloon_alert_to_viewers("destination not found")
+ balloon_alert(user, "destination not found")
playsound(src, 'sound/machines/terminal_error.ogg', 50, FALSE)
return FALSE
- to_chat(user, span_notice("Fax sent. Dispensing paper for personal record keeping. Thank you for using the Nanotrasen Approved Faxing Device!"))
- eject_stored_paper()
- flick("fax_send", src)
+ var/send_overlay = find_overlay_state(stored_paper, "send")
+
+ balloon_alert(user, "fax sent")
+ addtimer(CALLBACK(src, PROC_REF(send_paper_print_copy), user, stored_paper), 2 SECONDS)
+ stored_paper = null // Done here so they can't yoink it out before the callback
+ update_appearance(UPDATE_OVERLAYS)
+
+ flick("[base_icon_state]_send", src)
+ flick_overlay_view(send_overlay, 2 SECONDS)
+
+ history_add("Send", destination)
playsound(src, 'sound/machines/terminal_processing.ogg', 35, FALSE)
COOLDOWN_START(src, fax_cooldown, FAX_COOLDOWN_TIME)
use_power(active_power_usage)
+/obj/machinery/fax/proc/send_paper_print_copy(mob/user, obj/item/paper/copy)
+ if(QDELETED(copy))
+ return
+
+ if(!QDELETED(user))
+ balloon_alert(user, "copy dispensed")
+
+ copy.forceMove(drop_location())
+ update_appearance(UPDATE_OVERLAYS)
+
/**
* Send the content of admin faxes to admins directly.
* [sender] - the mob who sent the fax
@@ -374,70 +451,39 @@ GLOBAL_LIST_EMPTY(fax_machines)
* [destination_color] - the color of the span that encompasses [destination_string]
* [destination_string] - the string that says where this fax was sent (syndiate or centcom)
*/
-/obj/machinery/fax_machine/proc/send_fax_to_admins(mob/sender, fax_contents, destination_color, destination_string)
+/obj/machinery/fax/proc/send_fax_to_admins(mob/sender, fax_contents, destination_color, destination_string)
var/message = copytext_char(sanitize(fax_contents), 1, MAX_MESSAGE_LEN)
deadchat_broadcast(" has sent a fax to: [destination_string], with the message: \"[message]\" at [span_name("[get_area_name(sender, TRUE)]")].", span_name("[sender.real_name]"), sender, message_type = DEADCHAT_ANNOUNCEMENT)
to_chat(GLOB.admins, span_adminnotice("FAX TO [destination_string]: [ADMIN_FULLMONTY(sender)] [ADMIN_FAX_REPLY(src)]: [message]"), confidential = TRUE)
-/datum/admins/Topic(href, href_list)
+/obj/machinery/fax/Exited(atom/movable/gone, direction)
. = ..()
- if(href_list["FaxReply"])
- var/obj/machinery/fax_machine/source = locate(href_list["FaxReply"]) in GLOB.fax_machines
- source.admin_create_fax(usr)
-
-/obj/machinery/fax_machine/vv_get_dropdown()
- . = ..()
- VV_DROPDOWN_OPTION(VV_SEND_FAX, "Send new fax")
- VV_DROPDOWN_OPTION(VV_SEND_MARKED_FAX, "Send marked paper as fax")
-
-/obj/machinery/fax_machine/vv_do_topic(list/href_list)
+ if(gone in received_paperwork)
+ LAZYREMOVE(received_paperwork, gone)
+ if(gone == stored_paper)
+ stored_paper = null
+ update_appearance(UPDATE_OVERLAYS)
+ if(gone == received_paper)
+ received_paper = null
+
+/obj/machinery/fax/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
- if(href_list[VV_SEND_FAX])
- admin_create_fax(usr)
- if(href_list[VV_SEND_MARKED_FAX])
- var/obj/item/paper/marked_paper = usr.client?.holder?.marked_datum
- if(isnull(marked_paper))
- to_chat(usr, span_warning("You have no marked datum, or something went wrong."))
- return
- if(!istype(marked_paper))
- to_chat(usr, span_warning("You don't have a paper marked."))
- return
- if(tgui_alert(usr, "Do you want to send [marked_paper] to [src]?", "Send Fax", list("Yes", "Cancel")) == "Cancel")
- return
- var/source = input(usr, "Who's sending this fax? Leave blank for default name", "Send Fax") as null | text
- if(receive_paper(marked_paper, source, TRUE))
- to_chat(usr, span_notice("Fax successfully sent."))
- else
- to_chat(usr, span_danger("Fax failed to send."))
+ if(arrived == stored_paper)
+ update_appearance(UPDATE_OVERLAYS)
-/**
- * Admin proc to create a fax (a message) and send it to this machine.
- * [user] is the admin.
- */
-/obj/machinery/fax_machine/proc/admin_create_fax(mob/user)
- if(!check_rights_for(user.client, R_ADMIN))
- return
+/obj/machinery/fax/proc/raw_paper_text_to_ui_text(obj/item/paper/paper)
+ var/paper_contents = ""
+ for(var/datum/paper_input/line as anything in paper.raw_text_inputs)
+ if(paper_contents)
+ paper_contents += " \[FULL STOP\] "
+ paper_contents += line.raw_text
- var/obj/item/paper/sent_paper = new()
- var/fax = stripped_multiline_input(user, "Write your fax to send here.", "Send Fax", max_length = MAX_MESSAGE_LEN)
- if(length(fax))
- sent_paper.add_raw_text(fax)
- else
- to_chat(user, span_warning("No contents inputted."))
- qdel(sent_paper)
- return
+ if(paper_contents)
+ paper_contents += " \[END\]"
+ paper_contents = remove_all_tags(paper_contents) // remove html stuff
+ paper_contents = TextPreview(paper_contents, MAX_DISPLAYED_PAPER_CHARS) // trims it down to a reasonable length
- var/title = input(user, "Write the paper's title here. Leave blank for default title (\"paper\")", "Send Fax") as null | text
- if(title)
- sent_paper.name = title
-
- var/source = input(user, "Who's sending this fax? Leave blank for default name (\"Central Command\", or \"the Syndicate\" if emagged)", "Send Fax") as null | text
- sent_paper.update_appearance()
- if(receive_paper(sent_paper, source, TRUE))
- to_chat(user, span_notice("Fax successfully sent."))
- else
- to_chat(user, span_danger("Fax failed to send."))
- qdel(sent_paper)
+ return paper_contents
/**
* receive [new_paper] as a fax from [source].
@@ -450,7 +496,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
*
* returns TRUE if the fax was received.
*/
-/obj/machinery/fax_machine/proc/receive_paper(obj/item/paper/new_paper, source, forced = FALSE)
+/obj/machinery/fax/proc/receive_paper(obj/item/paper/new_paper, source, forced = FALSE)
if(!new_paper)
return FALSE
@@ -461,10 +507,9 @@ GLOBAL_LIST_EMPTY(fax_machines)
if(!receiving_enabled)
return FALSE
- if(isnull(source) || !length(source))
- source = (obj_flags & EMAGGED ? "employer" : CENTCOM_FAX_MACHINE)
- if(received_paper)
- eject_received_paper()
+ if(!length(source))
+ source = (obj_flags & EMAGGED) ? "employer" : CENTCOM_FAX_MACHINE
+ received_paper?.forceMove(drop_location())
new_paper.name = "fax - [new_paper.name]"
new_paper.was_faxed_from = source
@@ -472,6 +517,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
received_paper.forceMove(src)
unread_message = TRUE
alert_received_paper(source)
+ history_add("Receive", source)
return TRUE
@@ -479,7 +525,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
* Display an alert that [src] received a message from [source].
* [source] is a string of a location or company.
*/
-/obj/machinery/fax_machine/proc/alert_received_paper(source)
+/obj/machinery/fax/proc/alert_received_paper(source)
if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE))
return FALSE
@@ -497,7 +543,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
*
* returns TRUE if the paperwork was correct, FALSE otherwise.
*/
-/obj/machinery/fax_machine/proc/check_paperwork(obj/item/paper/processed/checked_paper, mob/living/user)
+/obj/machinery/fax/proc/check_paperwork(obj/item/paper/processed/checked_paper, mob/living/user)
var/paper_check = checked_paper.check_requirements()
var/message = ""
switch(paper_check)
@@ -511,50 +557,53 @@ GLOBAL_LIST_EMPTY(fax_machines)
message = "Protocal violated. Paperwork unprocessed."
if(FAIL_QUESTION_WRONG)
message = "Protocal violated. Paperwork not processed correctly."
- else
+ if(PAPERWORK_SUCCESS)
message = "Paperwork successfuly processed. Dispensing payment."
+ else
+ stack_trace("Invalid value returned from paperwork check_requirements(): [paper_check]")
+ message = "Paperwork failed to transmit. Contact your local Central Command correspondent."
say(message)
- if(paper_check)
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
- . = FALSE
- else
+ if(paper_check == PAPERWORK_SUCCESS)
new /obj/item/holochip(drop_location(), rand(15, 25))
playsound(src, 'sound/machines/ping.ogg', 60)
. = TRUE
+ else
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ . = FALSE
- LAZYREMOVE(received_paperwork, checked_paper)
qdel(checked_paper)
use_power(active_power_usage)
+ return .
/**
* Insert [inserted_paper] into the fax machine, adding it to the list of [received_paperwork] if possible.
* [inserted_paper] is an instantiated paper.
* [user] is the mob placing the paper into the machine.
*/
-/obj/machinery/fax_machine/proc/insert_processed_paper(obj/item/paper/processed/inserted_paper, mob/living/user)
+/obj/machinery/fax/proc/insert_processed_paper(obj/item/paper/processed/inserted_paper, mob/living/user)
if(LAZYLEN(received_paperwork) >= max_paperwork)
- to_chat(user, span_danger("You cannot place [inserted_paper] into [src], it's full."))
+ balloon_alert(user, "it's full!")
return
inserted_paper.forceMove(src)
LAZYADD(received_paperwork, inserted_paper)
- to_chat(user, span_notice("You insert [inserted_paper] into [src], readying it for processing."))
+ balloon_alert(user, "paperwork inserted")
/**
* Insert [inserted_paper] into the fax machine, setting [stored_paper] to [inserted_paper].
* [inserted_paper] is an instantiated paper.
* [user] is the mob placing the paper into the machine.
*/
-/obj/machinery/fax_machine/proc/insert_paper(obj/item/paper/inserted_paper, mob/living/user)
- inserted_paper.forceMove(src)
+/obj/machinery/fax/proc/insert_paper(obj/item/paper/inserted_paper, mob/living/user)
+ var/existing = FALSE
if(stored_paper)
- to_chat(user, span_notice("You take out [stored_paper] from [src] and insert [inserted_paper]."))
- eject_stored_paper(user)
- else
- to_chat(user, span_notice("You insert [inserted_paper] into [src]."))
+ stored_paper.forceMove(drop_location())
+ existing = TRUE
+ balloon_alert(user, "paper [existing ? "replaced" : "inserted"]")
stored_paper = inserted_paper
+ inserted_paper.forceMove(src)
/**
* Call [proc/eject_select_paperwork] on all papers in [received_paperwork].
@@ -563,7 +612,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
*
* Then, null the list after all is done.
*/
-/obj/machinery/fax_machine/proc/eject_all_paperwork(mob/living/user)
+/obj/machinery/fax/proc/eject_all_paperwork(mob/living/user)
for(var/obj/item/paper/processed/paper as anything in received_paperwork)
eject_select_paperwork(user, paper)
received_paperwork = null
@@ -575,13 +624,13 @@ GLOBAL_LIST_EMPTY(fax_machines)
* If [user] is specified, pass [user] into the [proc/eject_select_paperwork] call,
* dispensing as much paper into their hands as possible.
*/
-/obj/machinery/fax_machine/proc/eject_all_paperwork_with_delay(mob/living/user)
+/obj/machinery/fax/proc/eject_all_paperwork_with_delay(mob/living/user)
if(!LAZYLEN(received_paperwork))
- SStgui.update_uis(src)
return
if(received_paperwork[1])
eject_select_paperwork(user, received_paperwork[1], FALSE)
+ playsound(src, 'sound/machines/printer.ogg', 50, TRUE)
addtimer(CALLBACK(src, PROC_REF(eject_all_paperwork_with_delay), user), 2 SECONDS)
/**
@@ -591,71 +640,31 @@ GLOBAL_LIST_EMPTY(fax_machines)
* [paper] must be an instantiated paper already in [list/received_paperwork].
* if [silent] is FALSE, give feedback and play a sound.
*/
-/obj/machinery/fax_machine/proc/eject_select_paperwork(mob/living/user, obj/item/paper/processed/paper, silent = TRUE)
+/obj/machinery/fax/proc/eject_select_paperwork(mob/living/user, obj/item/paper/processed/paper, silent = TRUE)
if(!paper)
return
-
if(user?.CanReach(src))
user.put_in_hands(paper)
else
paper.forceMove(drop_location())
- LAZYREMOVE(received_paperwork, paper)
- if(!silent)
- flick("fax_receive", src)
- playsound(src, 'sound/machines/ding.ogg', 50, FALSE)
- use_power(active_power_usage)
-
-/**
- * Remove [paper] from the list of [received_paperwork] and delete it.
- * [paper] must be an instantiated paper in [list/received_paperwork].
- */
-/obj/machinery/fax_machine/proc/delete_select_paperwork(obj/item/paper/processed/paper)
- LAZYREMOVE(received_paperwork, paper)
- qdel(paper)
- use_power(active_power_usage)
-
-/**
- * Eject the instance [stored_paper].
- * if [user] is supplied, attempt to put it in their hands. Otherwise, drop it to the floor.
- *
- * if [silent] is FALSE, give feedback to people nearbly that a paper was removed.
- */
-/obj/machinery/fax_machine/proc/eject_stored_paper(mob/living/user, silent = TRUE)
- if(!stored_paper)
+ if(silent)
return
- if(!silent)
- flick("fax_receive", src)
- balloon_alert_to_viewers("removed paper")
- if(user && user.CanReach(src))
- user.put_in_hands(stored_paper)
- else
- stored_paper.forceMove(drop_location())
- stored_paper = null
- SStgui.update_uis(src)
+ flick("[base_icon_state]_receive", src)
+ flick_overlay_view(find_overlay_state(paper, "receive"), 2 SECONDS)
+ playsound(src, 'sound/machines/ding.ogg', 50, FALSE)
+ use_power(active_power_usage)
-/**
- * Eject the instance [received_paper].
- * if [user] is supplied, attempt to put it in their hands. Otherwise, drop it to the floor.
- *
- * if [silent] is FALSE, give feedback to people nearbly that a paper was removed.
- */
-/obj/machinery/fax_machine/proc/eject_received_paper(mob/living/user, silent = TRUE)
- if(!received_paper)
+/// Sends messages to the syndicate when emagged.
+/obj/machinery/fax/emag_act(mob/user)
+ if(!panel_open)
+ if(locked)
+ balloon_alert(user, "panel hacked")
+ playsound(src, 'sound/machines/terminal_eject.ogg', 30, FALSE)
+ else
+ balloon_alert(user, "open the panel first!")
return
- if(!silent)
- flick("fax_receive", src)
- balloon_alert_to_viewers("removed paper")
- if(user && user.CanReach(src))
- user.put_in_hands(received_paper)
- else
- received_paper.forceMove(drop_location())
- received_paper = null
- SStgui.update_uis(src)
-
-/// Sends messages to the syndicate when emagged.
-/obj/machinery/fax_machine/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
@@ -663,6 +672,45 @@ GLOBAL_LIST_EMPTY(fax_machines)
playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
obj_flags |= EMAGGED
+/obj/machinery/fax/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(isnull(held_item))
+ context[SCREENTIP_CONTEXT_RMB] = "Remove paper"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ switch(held_item.tool_behaviour)
+ if(TOOL_SCREWDRIVER)
+ context[SCREENTIP_CONTEXT_LMB] = "[panel_open ? "Close" : "Open"] maintenance panel"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(TOOL_WRENCH)
+ if(panel_open)
+ context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Unsecure" : "Secure"] maintenance panel"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(TOOL_MULTITOOL, TOOL_WIRECUTTER)
+ if(panel_open)
+ context[SCREENTIP_CONTEXT_LMB] = "Access wires"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(TOOL_CROWBAR)
+ if(panel_open)
+ context[SCREENTIP_CONTEXT_LMB] = "Deconstruct"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(istype(held_item, /obj/item/card/emag))
+ context[SCREENTIP_CONTEXT_LMB] = panel_open ? "Override routing address" : "Hack panel"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(istype(held_item, /obj/item/paper))
+ context[SCREENTIP_CONTEXT_LMB] = "Insert"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(!isnull(held_item.GetID()))
+ context[SCREENTIP_CONTEXT_LMB] = "[locked ? "Unlock" : "Lock"] panel"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return NONE
+
// ----- Paper definitions and subtypes for interactions with the fax machine. -----
/obj/item/paper
/// If this paper was sent via fax, where it came from.
@@ -754,12 +802,18 @@ GLOBAL_LIST_EMPTY(fax_machines)
return PAPERWORK_SUCCESS
+
+// Wire IDs for the fax machine
+#define WIRE_SEND_FAXES "Send wire"
+#define WIRE_RECEIVE_FAXES "Receive wire"
+#define WIRE_PAPERWORK "Paperwork wire"
+
/// Wires for the fax machine
-/datum/wires/fax2
- holder_type = /obj/machinery/fax_machine
+/datum/wires/fax
+ holder_type = /obj/machinery/fax
proper_name = "Fax Machine"
-/datum/wires/fax2/New(atom/holder)
+/datum/wires/fax/New(atom/holder)
wires = list(
WIRE_SEND_FAXES,
WIRE_RECEIVE_FAXES,
@@ -768,8 +822,8 @@ GLOBAL_LIST_EMPTY(fax_machines)
add_duds(1)
return ..()
-/datum/wires/fax2/get_status()
- var/obj/machinery/fax_machine/machine = holder
+/datum/wires/fax/get_status()
+ var/obj/machinery/fax/machine = holder
var/list/status = list()
var/service_light_intensity
switch((machine.sending_enabled + machine.receiving_enabled))
@@ -783,33 +837,31 @@ GLOBAL_LIST_EMPTY(fax_machines)
status += "The bluespace transceiver is glowing [machine.can_receive_paperwork ? "blue" : "red"]."
return status
-/datum/wires/fax2/on_pulse(wire, user)
- var/obj/machinery/fax_machine/machine = holder
+/datum/wires/fax/on_pulse(wire, user)
+ var/obj/machinery/fax/machine = holder
switch(wire)
if(WIRE_SEND_FAXES)
machine.send_stored_paper(user)
if(WIRE_PAPERWORK)
- machine.can_receive_paperwork = !machine.can_receive_paperwork
+ if(machine.is_allowed_to_toggle_paperwork)
+ machine.can_receive_paperwork = !machine.can_receive_paperwork
if(WIRE_RECEIVE_FAXES)
if(machine.receiving_enabled)
machine.receiving_enabled = FALSE
addtimer(VARSET_CALLBACK(machine, receiving_enabled, TRUE), 30 SECONDS)
-/datum/wires/fax2/on_cut(wire, mend)
- var/obj/machinery/fax_machine/machine = holder
+/datum/wires/fax/on_cut(wire, mend)
+ var/obj/machinery/fax/machine = holder
switch(wire)
if(WIRE_SEND_FAXES)
machine.sending_enabled = mend
if(WIRE_RECEIVE_FAXES)
machine.receiving_enabled = mend
-#undef FAX_COOLDOWN_TIME
-#undef FAX_UNREAD_ALERT_TIME
-#undef MAX_DISPLAYED_PAPER_CHARS
-
#undef WIRE_SEND_FAXES
#undef WIRE_RECEIVE_FAXES
#undef WIRE_PAPERWORK
-#undef VV_SEND_FAX
-#undef VV_SEND_MARKED_FAX
+#undef FAX_COOLDOWN_TIME
+#undef FAX_UNREAD_ALERT_TIME
+#undef MAX_DISPLAYED_PAPER_CHARS
diff --git a/maplestation_modules/code/game/objects/structures/crate_lockers/closets/secure/bridge_officer.dm b/maplestation_modules/code/game/objects/structures/crate_lockers/closets/secure/bridge_officer.dm
index a689dc4aed3f..512b6370aa07 100644
--- a/maplestation_modules/code/game/objects/structures/crate_lockers/closets/secure/bridge_officer.dm
+++ b/maplestation_modules/code/game/objects/structures/crate_lockers/closets/secure/bridge_officer.dm
@@ -16,8 +16,8 @@
new /obj/item/taperecorder(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
- new /obj/item/circuitboard/machine/fax_machine(src)
- new /obj/item/stack/sheet/mineral/silver(src, 3)
+ new /obj/item/circuitboard/machine/fax/deluxe(src)
+ new /obj/item/stack/sheet/mineral/silver(src, 2)
new /obj/item/stamp/bo(src)
// Bridge Officer album for their locker
diff --git a/maplestation_modules/code/modules/research/techweb/all_nodes.dm b/maplestation_modules/code/modules/research/techweb/all_nodes.dm
index 3953a2c2fc3c..76995dbc72e2 100644
--- a/maplestation_modules/code/modules/research/techweb/all_nodes.dm
+++ b/maplestation_modules/code/modules/research/techweb/all_nodes.dm
@@ -13,7 +13,7 @@
/datum/techweb_node/base
id_additions = list(
- "fax_machine",
+ "fax_machine_deluxe",
)
/datum/techweb_node/exp_surgery
diff --git a/maplestation_modules/icons/obj/machines/fax.dmi b/maplestation_modules/icons/obj/machines/fax.dmi
deleted file mode 100644
index 1cfd0017ff56..000000000000
Binary files a/maplestation_modules/icons/obj/machines/fax.dmi and /dev/null differ
diff --git a/strings/paperwork.json b/strings/paperwork.json
index 59823d4c75bb..fb3c97fa930e 100644
--- a/strings/paperwork.json
+++ b/strings/paperwork.json
@@ -1,5 +1,4 @@
{
-
"occasion": {
"court case" : 11,
"criminal case" : 7,
@@ -18,9 +17,7 @@
"brochure" : 0.5,
"leaflet" : 0.5,
"flyer" : 0.5
-
},
-
"contents_court_cases": [
"subject_one is suing victim for abuse of company funds.",
"subject_one is suing subject_two for inter-corporation rivalry.",
@@ -37,8 +34,8 @@
"station_name's is requesting a new judge after the sudden death of their previous, and is requesting an authorization.",
"victim is requesting for a new lawyer and requires a sign off.",
"victim is pending a parole hearing, but station station_name wishes to ignore it, requesting authorization to ignore the parole.",
- "captain victim of a subject_one station is being tried for misconduct.",
- "captain victim of a station_name is being tried for misconduct.",
+ "Captain victim of a subject_one station is being tried for misconduct.",
+ "Captain victim of a station_name is being tried for misconduct.",
"victim has been caught stealing from EVA and is pending trial. Requesting if trial is permitted.",
"victim has been caught stealing from R&D and is pending trial. Requesting if trial is permitted.",
"victim has been caught stealing from Engineering and is pending trial. Requesting if trial is permitted.",
@@ -47,7 +44,6 @@
"victim has been involved in numerous bar brawls aboard station_name, ordered to seek medical attention, Requesting authorization to send off to a medical-ward.",
"victim has been deemed clinically insane. Requesting authorization to send off to a medical-ward."
],
-
"contents_executions": [
"victim @pick(execution_lines) by subject_one for traitorous activity.",
"victim @pick(execution_lines) for infiltrating subject_one.",
@@ -66,7 +62,7 @@
"victim @pick(execution_lines) for being a mime.",
"victim @pick(execution_lines) for killing Ian.",
"victim @pick(execution_lines) for killing Runtime.",
- "victim @pick(execution_lines) for mishandling of their stations Supermatter.",
+ "victim @pick(execution_lines) for mishandling of their station's Supermatter.",
"victim @pick(execution_lines) for letting a Singularity loose.",
"victim @pick(execution_lines) for letting a Tesla loose.",
"victim @pick(execution_lines) for sabotaging the Supermatter.",
@@ -80,29 +76,27 @@
"victim @pick(execution_lines) for murdering PunPun.",
"victim @pick(execution_lines) for being different.",
"victim @pick(execution_lines) for liking pineapples on their pizza.",
- "victim @pick(execution_lines) for breaking into the armoy.",
+ "victim @pick(execution_lines) for breaking into the armory.",
"victim @pick(execution_lines) for shooting the Supermatter."
],
-
"execution_lines": [
"is being executed",
"is being re-educated",
"is being killed",
- "is being transfered",
+ "is being transferred",
"is slated for transfer",
"is slated for re-education",
- "is being considered for exeuction",
+ "is being considered for execution",
"is being considered for re-education",
"is being executed via firing line",
"is being executed via lethal injection",
- "is being executed via electri chair",
+ "is being executed via electric chair",
"is being re-educated in a third party's facility"
],
-
"contents_patents": [
"subject_one is patenting a revolutionary new blanket that keeps lizardpeople warm.",
- "subject_one is attemping to patent bluespace.",
- "subject_one is attemping to patent plasma.",
+ "subject_one is attempting to patent bluespace.",
+ "subject_one is attempting to patent plasma.",
"subject_one is patenting a computer that does scientists jobs for them.",
"subject_one is prototyping an engine that replaces the Supermatter.",
"subject_one is method that makes the Hypertorus Fusion Reactor safer.",
@@ -132,20 +126,12 @@
"subject_one working on machines to make evacuation shuttles calmer.",
"subject_one has patented a revolutionary [REDACTED]."
],
-
"contents_random": [
"Lorem Ipsum is simply dummy text of the printing and typesetting industry.",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed bibendum venenatis arcu ac semper.",
"Proin commodo nibh purus, ut rhoncus nibh efficitur quis. Quisque euismod.",
"Nulla maximus cursus massa, vel bibendum mi sollicitudin eu. Proin at nisi vel mi vehicula.",
"Maecenas ullamcorper tempus dui, vel blandit urna viverra nec. Class aptent taciti sociosqu ad litora.",
- "Leclerc's lawsuit.",
- "Gah-Jeeliu's medical bill.",
- "Rasha-Tanaka's requests form.",
- "Joey Petunia's bombing charges.",
- "Dendy Doom's missing degree.",
- "Aza-Zure's missing report.",
- "Mortimer v. Oxygen case report.",
"THIS IS A TEST DOCUMENT. PLEASE IGNORE. PLEASE DO NOT SIGN. PLEASE RETURN TO YOUR STATIONS DESIGNATED OFFICER.",
"Is your refrigerator running? Well, you should catch it.",
"We're trying to reach you about your shuttles extended warranty.",
@@ -161,7 +147,5 @@
"todays security code is:",
"todays communications decryption key is:",
"Why would a shuttle full of evacuees all snap and beat each other to death the moment they reached safety?"
-
]
-
}
diff --git a/tgui/packages/tgui/interfaces/_FaxMachine.js b/tgui/packages/tgui/interfaces/_FaxMachine.tsx
similarity index 70%
rename from tgui/packages/tgui/interfaces/_FaxMachine.js
rename to tgui/packages/tgui/interfaces/_FaxMachine.tsx
index 85d611712d40..c7255b6dd401 100644
--- a/tgui/packages/tgui/interfaces/_FaxMachine.js
+++ b/tgui/packages/tgui/interfaces/_FaxMachine.tsx
@@ -1,9 +1,48 @@
import { useBackend, useSharedState, useLocalState } from '../backend';
-import { BlockQuote, Box, Button, Divider, Dropdown, Section, Stack, Tabs } from '../components';
+import { BlockQuote, Box, Button, Dimmer, Divider, Dropdown, Icon, LabeledList, Section, Stack, Tabs } from '../components';
+import { BooleanLike } from 'common/react';
import { Window } from '../layouts';
+enum historyType {
+ Send = 'Send',
+ Receive = 'Receive',
+}
+
+type Paperwork = Paper & {
+ num: number;
+ required_answer: string;
+};
+
+type Paper = {
+ ref: string;
+ contents: string;
+ source: string;
+};
+
+type History = {
+ history_type: historyType;
+ history_fax_name: string;
+ history_time: string;
+ iterator: number;
+};
+
+type Data = {
+ display_name: string;
+ destination_options: string[];
+ default_destination: string;
+ received_paperwork: Paperwork[];
+ received_paper: Paper | null;
+ stored_paper: Paper | null;
+ history: History[];
+ can_send: BooleanLike;
+ can_receive: BooleanLike;
+ can_toggle_can_receive: BooleanLike;
+ emagged: BooleanLike;
+ unread_message: BooleanLike;
+};
+
export const _FaxMachine = (props, context) => {
- const { act, data } = useBackend(context);
+ const { act, data } = useBackend(context);
const {
display_name,
@@ -12,8 +51,11 @@ export const _FaxMachine = (props, context) => {
received_paperwork = [],
received_paper,
stored_paper,
- can_send_cc_messages,
+ history = [],
+
+ can_send,
can_receive,
+ can_toggle_can_receive,
emagged,
unread_message,
} = data;
@@ -45,7 +87,7 @@ export const _FaxMachine = (props, context) => {
{
setTab(1)}>
Send A Fax
{
@@ -81,15 +123,22 @@ export const _FaxMachine = (props, context) => {
}}>
- received Faxes
+ Received Faxes
{received_paper && !!unread_message && (
-
- {'New message!'}
+
+ New!
)}
+ setTab(3)}>
+ History
+
@@ -126,6 +175,29 @@ export const _FaxMachine = (props, context) => {
No papers have been received.
))}
+ {tab === 3 && (
+
+
+ {history.map((history_item) => (
+
+ {history_item.history_type === historyType.Send ? (
+
+ Sent to {history_item.history_fax_name} at{' '}
+ {history_item.history_time}
+
+ ) : (
+
+ Received from {history_item.history_fax_name} at{' '}
+ {history_item.history_time}
+
+ )}
+
+ ))}
+
+
+ )}
{tab === 1 && stored_paper && (
@@ -136,21 +208,18 @@ export const _FaxMachine = (props, context) => {
icon="fax"
color={emagged ? 'bad' : 'good'}
content="Send to: "
- disabled={
- tab !== 1 ||
- !stored_paper ||
- !(can_send_cc_messages || emagged)
- }
+ disabled={tab !== 1 || !stored_paper || !can_send}
tooltip={
'Send the contents of the paper currently inserted \
- in the machine to the destination specified. Response not guaranteed. \
- A copy of the sent paper will print, too - for record-keeping.'
+ in the machine to the destination specified. \
+ Response not guaranteed.'
}
- onClick={() =>
+ onClick={() => {
act('send_stored_paper', {
destination_machine: destination,
- })
- }
+ });
+ data.stored_paper = null; // this is probably bad but I can't figure out a way to get it to update. Don't replicate
+ }}
/>
@@ -158,9 +227,7 @@ export const _FaxMachine = (props, context) => {
width="100%"
selected={selectedDestination}
options={destination_options}
- onSelected={(dest) => {
- setDestination(dest);
- }}
+ onSelected={(dest) => setDestination(dest)}
/>
@@ -172,7 +239,10 @@ export const _FaxMachine = (props, context) => {
disabled={!received_paper}
content="Print received Fax"
tooltip="Print the last received fax."
- onClick={() => act('print_received_paper')}
+ onClick={() => {
+ act('print_received_paper');
+ data.received_paper = null; // this is probably bad but I can't figure out a way to get it to update. Don't replicate
+ }}
/>
@@ -185,15 +255,30 @@ export const _FaxMachine = (props, context) => {
buttons={
act('toggle_recieving')}
/>
}>
+ {!can_receive && !can_toggle_can_receive && (
+
+
+
+
+
+
+ This fax machine cannot receive paperwork.
+
+
+
+ )}
{received_paperwork && received_paperwork.length > 0 ? (
@@ -210,7 +295,7 @@ export const _FaxMachine = (props, context) => {
))}
) : (
- 'No stored paperwork to process.'
+ No stored paperwork to process.
)}
@@ -251,7 +336,7 @@ export const _FaxMachine = (props, context) => {
This is how you stamp and process the paperwork."
onClick={() =>
act('print_select_paperwork', {
- ref: selectedPaper.ref,
+ ref: selectedPaper?.ref,
})
}
/>
@@ -265,7 +350,7 @@ export const _FaxMachine = (props, context) => {
validity and receive your payment."
onClick={() =>
act('check_paper', {
- ref: selectedPaper.ref,
+ ref: selectedPaper?.ref,
})
}
/>
@@ -278,7 +363,7 @@ export const _FaxMachine = (props, context) => {
tooltip="Delete the selected paperwork from the machine."
onClick={() =>
act('delete_select_paperwork', {
- ref: selectedPaper.ref,
+ ref: selectedPaper?.ref,
})
}
/>