diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
index 7ab76dc075a..5a9f25c7d29 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
@@ -227,7 +227,7 @@
dir = 4
},
/obj/item/pressure_plate/hologrid{
- reward = /mob/living/simple_animal/pet/dog/bullterrier
+ reward = /mob/living/basic/pet/dog/bullterrier
},
/turf/open/floor/plating,
/area/ruin/powered/mailroom)
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
index 30c16059c1d..88fe9d8ee8f 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
@@ -55,12 +55,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/cargodise_freighter/bridge)
-"bk" = (
-/obj/structure/table/reinforced,
-/obj/item/modular_computer/pda/clear,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/cargodise_freighter/bridge)
"bo" = (
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -1350,6 +1344,12 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/cargodise_freighter/bridge)
+"wb" = (
+/obj/structure/table/reinforced,
+/obj/item/modular_computer/pda/engineering,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/cargodise_freighter/bridge)
"wd" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -1783,15 +1783,6 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plating,
/area/ruin/space/has_grav/cargodise_freighter/utility)
-"BM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/mob/living/simple_animal/pet/dog/dobermann{
- desc = "The freighter's loyal, canine companion!";
- dir = 8;
- name = "Ace"
- },
-/turf/open/floor/carpet,
-/area/ruin/space/has_grav/cargodise_freighter/quarters)
"BN" = (
/obj/item/storage/cans/sixsoda,
/obj/structure/cable,
@@ -2430,6 +2421,15 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/cargodise_freighter/utility)
+"Mx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/mob/living/basic/pet/dog/dobermann{
+ desc = "The freighter's loyal, canine companion!";
+ dir = 8;
+ name = "Ace"
+ },
+/turf/open/floor/carpet,
+/area/ruin/space/has_grav/cargodise_freighter/quarters)
"Mz" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -2502,6 +2502,12 @@
/obj/effect/turf_decal/tile/brown/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/cargodise_freighter/mining)
+"Ng" = (
+/obj/structure/table/reinforced,
+/obj/item/modular_computer/pda/clear,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/cargodise_freighter/bridge)
"Nk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -3151,12 +3157,6 @@
/obj/effect/spawner/random/engineering/flashlight,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/cargodise_freighter/primaryhall)
-"UM" = (
-/obj/structure/table/reinforced,
-/obj/item/modular_computer/pda/engineering,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/cargodise_freighter/bridge)
"UX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/turf_decal/tile/brown/fourcorners,
@@ -3971,7 +3971,7 @@ Zy
qq
eb
lV
-BM
+Mx
su
su
ZU
@@ -5094,9 +5094,9 @@ wd
GT
PC
GT
-UM
+wb
GT
-bk
+Ng
Yp
PK
lp
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/gorilla.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/gorilla.dmm
index 90617eb90c7..4438d8342f3 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/gorilla.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/gorilla.dmm
@@ -31,7 +31,7 @@
/turf/open/misc/beach/sand,
/area/ruin/space/has_grav/powered)
"H" = (
-/mob/living/simple_animal/pet/dog/corgi{
+/mob/living/basic/pet/dog/corgi{
anchored = 1
},
/obj/structure/bed/dogbed,
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 46ed097d339..89dc4151369 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -799,15 +799,6 @@
},
/turf/open/floor/iron/large,
/area/station/security/office)
-"aje" = (
-/obj/structure/closet/secure_closet/security,
-/obj/item/radio/intercom/directional/north,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"ajr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -830,11 +821,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
-"ajY" = (
-/obj/structure/chair/sofa/corner/brown,
-/obj/structure/noticeboard/directional/east,
-/turf/open/floor/carpet/blue,
-/area/station/medical/psychology)
"akf" = (
/obj/structure/table/reinforced,
/obj/item/bodypart/chest/robot,
@@ -1000,13 +986,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/plating,
/area/station/commons/toilet/restrooms)
-"amp" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/arrivals)
"amq" = (
/obj/structure/table/wood,
/obj/item/clothing/suit/syndicatefake,
@@ -1304,21 +1283,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/station/solars/starboard/fore)
-"aoS" = (
-/obj/structure/cable,
-/obj/machinery/computer/security{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Security Post - Arrivals"
- },
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"aoT" = (
/obj/machinery/computer/secure_data{
dir = 4
@@ -1501,13 +1465,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"arc" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"ari" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/airalarm/directional/south,
@@ -2156,20 +2113,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"axm" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "Experimentor Lab Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
-"axo" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/structure/bed/dogbed/mcgriff,
-/mob/living/simple_animal/pet/dog/pug/mcgriff,
-/turf/open/floor/iron,
-/area/station/security/warden)
"axq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4003,6 +3946,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"aWm" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "Quartermaster Junction"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/cargo,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"aWu" = (
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
@@ -4768,14 +4724,6 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
-"bfS" = (
-/obj/effect/landmark/secequipment,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"bfT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -6310,16 +6258,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
-"bwM" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "Library Junction"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/mail_sorting/service/library,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit)
"bwU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6610,14 +6548,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
-"bAY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/machinery/holopad,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"bBa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6703,6 +6633,15 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"bBI" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "Xenobio Junction"
+ },
+/obj/effect/landmark/event_spawn,
+/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"bBK" = (
/obj/effect/turf_decal/tile/red,
/obj/machinery/flasher/directional/south{
@@ -6740,6 +6679,17 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"bCf" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/aft)
"bCn" = (
/obj/effect/turf_decal/trimline/yellow/corner,
/turf/open/floor/iron,
@@ -7933,6 +7883,20 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"bPi" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Research Junction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/research,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"bPj" = (
/obj/machinery/rnd/production/techfab/department/cargo,
/obj/effect/turf_decal/stripes/box,
@@ -8820,6 +8784,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"bYw" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "RD Junction"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/machinery/duct,
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
+/turf/open/floor/iron/large,
+/area/station/science/research)
"bYx" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/stripes/line{
@@ -9065,15 +9043,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
-"cbX" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "HoS Junction"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
-/turf/open/floor/iron,
-/area/station/security/office)
"cbY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum,
@@ -9261,6 +9230,13 @@
/obj/structure/sign/warning/radiation,
/turf/closed/wall,
/area/station/engineering/main)
+"ceX" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/arrivals)
"cfb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
@@ -9268,18 +9244,6 @@
icon_state = "foam_plating"
},
/area/station/maintenance/department/science/xenobiology)
-"cfd" = (
-/obj/structure/mop_bucket/janitorialcart,
-/obj/item/mop,
-/obj/item/reagent_containers/cup/bucket,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/siding/purple/corner{
- dir = 4
- },
-/obj/effect/turf_decal/bot/left,
-/obj/item/storage/bag/trash,
-/turf/open/floor/iron/checker,
-/area/station/service/janitor)
"cfp" = (
/obj/structure/table/wood,
/obj/item/storage/box/rubbershot{
@@ -9671,6 +9635,22 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay)
+"ckg" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Robotics Junction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/mail_sorting/science/robotics,
+/turf/open/floor/iron/white/side{
+ dir = 8
+ },
+/area/station/science/lobby)
"ckt" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -10358,6 +10338,14 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"crX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/right/directional/west{
+ req_access = list("atmospherics")
+ },
+/turf/open/floor/iron,
+/area/station/engineering/atmos/storage/gas)
"crY" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/effect/turf_decal/delivery,
@@ -10581,6 +10569,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"cvd" = (
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"cvr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11731,17 +11727,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"cJw" = (
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/sorting/mail{
- name = "Virology Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
-/turf/open/floor/iron,
-/area/station/medical/virology)
"cJD" = (
/turf/closed/wall,
/area/station/security/checkpoint/escape)
@@ -13979,6 +13964,19 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"dos" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/entertainment/cigarette_pack,
+/obj/effect/spawner/random/entertainment/cigarette_pack{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/storage/box/coffeepack{
+ pixel_x = -13;
+ pixel_y = 7
+ },
+/turf/open/floor/wood,
+/area/station/engineering/break_room)
"dou" = (
/obj/structure/window/reinforced/spawner/north,
/obj/structure/table,
@@ -14334,6 +14332,12 @@
/obj/effect/spawner/random/trash/soap,
/turf/open/floor/plating,
/area/station/medical/abandoned)
+"dsH" = (
+/obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/coffeemaker/impressa,
+/turf/open/floor/wood,
+/area/station/engineering/break_room)
"dsM" = (
/obj/structure/table/glass,
/obj/item/storage/backpack/duffelbag/med/surgery,
@@ -14539,15 +14543,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
-"duK" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "Xenobio Junction"
- },
-/obj/effect/landmark/event_spawn,
-/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"duV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14987,6 +14982,13 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/commons/toilet/restrooms)
+"dzK" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dAX" = (
/obj/machinery/light/small/directional/west,
/obj/structure/sign/poster/official/work_for_a_future{
@@ -15090,6 +15092,22 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
+"dBV" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/sign/warning/biohazard/directional/south,
+/obj/machinery/duct,
+/obj/machinery/light/small/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"dCd" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -15559,6 +15577,19 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"dIo" = (
+/obj/structure/disposalpipe/sorting/mail{
+ name = "Engineering Junction"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/engineering/general,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"dIq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/structure/cable,
@@ -15586,25 +15617,6 @@
},
/turf/open/floor/iron,
/area/station/commons/toilet/restrooms)
-"dIJ" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/machinery/status_display/evac/directional/west,
-/obj/item/folder/white{
- pixel_x = -6;
- pixel_y = 15
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -6;
- pixel_y = 13
- },
-/obj/item/storage/box/coffeepack{
- pixel_x = 8;
- pixel_y = 17
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/break_room)
"dIU" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/trimline/neutral/warning,
@@ -15823,21 +15835,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"dLX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Checkpoint"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
+"dLS" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/checkpoint/arrivals)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "HoP Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/command)
"dMc" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16005,6 +16016,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"dNB" = (
+/obj/structure/cable,
+/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/warning{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "Medbay Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/general,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay)
"dNM" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/airalarm/directional/west,
@@ -16739,6 +16764,27 @@
/obj/machinery/shieldgen,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"dYF" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/virology{
+ name = "Virology Access"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"dYH" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -17416,6 +17462,15 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white/smooth_half,
/area/station/science/ordnance/storage)
+"ehn" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table/wood,
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/computer/libraryconsole{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"eho" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/obj/effect/turf_decal/tile/red/half/contrasted,
@@ -18421,6 +18476,26 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay)
+"etl" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "Kitchen Junction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/obj/structure/sign/poster/random/directional/west,
+/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
"etq" = (
/obj/structure/table/wood,
/obj/item/toy/talking/ai,
@@ -18476,6 +18551,31 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"etV" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = -6;
+ pixel_y = -24
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = 8;
+ pixel_y = -24
+ },
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_y = 32
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"etW" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -18933,13 +19033,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"eBb" = (
-/obj/structure/filingcabinet/security,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"eBn" = (
/turf/closed/wall,
/area/station/security/checkpoint/customs/aft)
@@ -19991,18 +20084,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"eOE" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/camera/directional/west{
- c_tag = "Medbay - Break Room";
- name = "medical camera";
- network = list("ss13","medical")
- },
-/obj/machinery/newscaster/directional/west,
-/obj/machinery/coffeemaker/impressa,
-/turf/open/floor/iron/dark,
-/area/station/medical/break_room)
"eOF" = (
/obj/structure/chair/office{
dir = 1
@@ -20154,16 +20235,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"eQd" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "Janitor Junction"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"eQi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -20383,6 +20454,21 @@
/obj/effect/landmark/start/cook,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"eTA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "Disposals Junction"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"eTF" = (
/obj/machinery/computer/secure_data,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -20390,14 +20476,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"eTK" = (
-/obj/structure/chair/sofa/right/brown,
-/obj/item/toy/plush/moth{
- name = "Moffee"
- },
-/obj/machinery/light/warm/directional/north,
-/turf/open/floor/carpet/blue,
-/area/station/medical/psychology)
"eTP" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 1
@@ -20547,15 +20625,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"eVk" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Bar Junction"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/mail_sorting/service/bar,
-/turf/open/floor/plating,
-/area/station/maintenance/department/crew_quarters/bar)
"eVl" = (
/turf/closed/wall/r_wall,
/area/station/tcommsat/computer)
@@ -20792,6 +20861,21 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"eXV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Checkpoint"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/checkpoint/arrivals)
"eXW" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall6";
@@ -21201,11 +21285,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"fcR" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/arrivals)
"fcW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22314,17 +22393,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"fqz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 1;
- name = "CMO Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay)
"fqO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22378,14 +22446,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"frR" = (
-/obj/machinery/computer/order_console/cook,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/service/kitchen)
"fse" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -22776,6 +22836,16 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
+"fvV" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "Library Junction"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/mail_sorting/service/library,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit)
"fvX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22846,14 +22916,6 @@
/obj/machinery/light/small/red/dim/directional/north,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/security)
-"fwK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/aft)
"fwL" = (
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23172,19 +23234,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/office)
-"fAS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/engineering{
- name = "Port Bow Solar Access"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/iron,
-/area/station/maintenance/solars/port/fore)
"fAT" = (
/obj/machinery/computer/cargo{
dir = 4
@@ -24508,16 +24557,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"fTx" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"fTz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25310,11 +25349,6 @@
dir = 1
},
/area/station/service/chapel)
-"gdb" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/arrivals)
"gdc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25525,15 +25559,6 @@
dir = 1
},
/area/station/service/kitchen)
-"gfl" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"gfp" = (
/obj/structure/table/wood,
/obj/structure/sign/nanotrasen{
@@ -25593,6 +25618,18 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"ggn" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Hydroponics Junction"
+ },
+/obj/machinery/duct,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
"ggu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26624,6 +26661,29 @@
},
/turf/open/floor/wood,
/area/station/engineering/break_room)
+"gsu" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
+"gsv" = (
+/obj/structure/bed/dogbed/ian,
+/obj/machinery/airalarm/directional/east,
+/mob/living/basic/pet/dog/corgi/ian,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"gsy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -26889,19 +26949,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"gvo" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"gvq" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -27152,16 +27199,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
-"gyZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Law Office Junction"
- },
-/obj/machinery/duct,
-/obj/effect/mapping_helpers/mail_sorting/service/law_office,
-/turf/open/floor/plating,
-/area/station/maintenance/department/security)
"gzj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/prisoner,
@@ -29101,6 +29138,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/chapel)
+"gYt" = (
+/obj/structure/table,
+/obj/machinery/computer/libraryconsole/bookmanagement{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron,
+/area/station/security/prison)
"gYv" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/vehicle/ridden/secway,
@@ -29616,13 +29661,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/command/heads_quarters/cmo)
-"hfs" = (
-/obj/structure/window/reinforced,
-/obj/machinery/vending/wardrobe/robo_wardrobe,
-/obj/effect/turf_decal/bot,
-/obj/structure/fireaxecabinet/mechremoval/directional/west,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"hfB" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/turf_decal/delivery,
@@ -29637,6 +29675,11 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/carpet,
/area/station/security/detectives_office)
+"hfI" = (
+/obj/structure/chair/sofa/right/brown,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood/tile,
+/area/station/service/library/artgallery)
"hfM" = (
/obj/effect/decal/cleanable/glass,
/obj/structure/sign/poster/contraband/random/directional/west,
@@ -30207,17 +30250,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/work)
-"hmS" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/item/crowbar,
-/obj/item/restraints/handcuffs,
-/obj/machinery/recharger,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"hmU" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
@@ -30843,6 +30875,18 @@
},
/turf/open/floor/iron,
/area/station/maintenance/fore)
+"hvp" = (
+/obj/structure/mop_bucket/janitorialcart,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/siding/purple/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot/left,
+/obj/item/storage/bag/trash,
+/turf/open/floor/iron/checker,
+/area/station/service/janitor)
"hvu" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31390,6 +31434,14 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"hDG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/machinery/holopad,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"hDJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -31881,6 +31933,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/command/teleporter)
+"hKO" = (
+/obj/structure/chair/sofa/corner/brown,
+/obj/structure/noticeboard/directional/east,
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
"hKZ" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/bot,
@@ -31970,6 +32027,14 @@
/obj/item/radio/intercom/prison/directional/east,
/turf/open/floor/iron,
/area/station/security/prison)
+"hMz" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/status_display/ai/directional/north,
+/obj/structure/chair/sofa/middle/brown,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"hMI" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -33039,6 +33104,16 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"hZW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Law Office Junction"
+ },
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/mail_sorting/service/law_office,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security)
"iaa" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -33256,23 +33331,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
-"icn" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/right/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"ico" = (
/obj/structure/table,
/obj/item/storage/medkit/regular,
@@ -33887,12 +33945,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"ijp" = (
-/obj/structure/bed/dogbed/ian,
-/obj/machinery/airalarm/directional/east,
-/mob/living/simple_animal/pet/dog/corgi/ian,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"iju" = (
/obj/structure/closet{
name = "Evidence Closet"
@@ -34289,6 +34341,20 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/hydroponics)
+"inD" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"inR" = (
/obj/machinery/door/airlock/research{
name = "Research and Development Lab"
@@ -34362,6 +34428,24 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"ioK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ name = "CE's Junction"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/engineering/lobby)
"ioN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34919,25 +35003,6 @@
/obj/item/pen,
/turf/open/floor/iron/grimy,
/area/station/command/bridge)
-"ixs" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/right/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"ixt" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable/multilayer/connected,
@@ -35109,20 +35174,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"izq" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Research Junction"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/purple/filled/warning{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/science/research,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"izx" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -35305,18 +35356,6 @@
"iBR" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/ce)
-"iBX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "Chapel Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/chapel,
-/turf/open/floor/iron,
-/area/station/maintenance/department/chapel)
"iCo" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red,
@@ -35551,22 +35590,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"iFg" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 10
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"iFn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36202,6 +36225,19 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/half,
/area/station/engineering/main)
+"iNQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ name = "Ordnance Junction"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
+/turf/open/floor/iron,
+/area/station/science/research)
"iNR" = (
/obj/item/kirbyplants/random,
/obj/machinery/status_display/evac/directional/east,
@@ -36403,6 +36439,17 @@
dir = 1
},
/area/station/service/kitchen)
+"iRt" = (
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/sorting/mail{
+ name = "Virology Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
+/turf/open/floor/iron,
+/area/station/medical/virology)
"iRu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/rack,
@@ -36758,6 +36805,15 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
+"iWx" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Bar Junction"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/mail_sorting/service/bar,
+/turf/open/floor/plating,
+/area/station/maintenance/department/crew_quarters/bar)
"iWA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37888,14 +37944,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
-"jix" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "Dormitories Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
"jiC" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral,
@@ -38754,6 +38802,28 @@
/obj/effect/spawner/random/trash/graffiti,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/morgue)
+"jsW" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/left/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"jta" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -39003,6 +39073,18 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"jvR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "Chapel Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/chapel,
+/turf/open/floor/iron,
+/area/station/maintenance/department/chapel)
"jvT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39183,29 +39265,12 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/main)
-"jyA" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"jyB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"jyJ" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Pharmacy Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay)
"jyP" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/effect/turf_decal/siding/dark_blue{
@@ -39611,13 +39676,6 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
-"jCu" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"jCv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/hydroponics/constructable,
@@ -39857,18 +39915,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/science/lab)
-"jFb" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Hydroponics Junction"
- },
-/obj/machinery/duct,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
-/turf/open/floor/iron,
-/area/station/maintenance/port/fore)
"jFd" = (
/obj/structure/window/reinforced{
dir = 1
@@ -40136,6 +40182,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"jIn" = (
+/obj/structure/closet/secure_closet/security,
+/obj/item/radio/intercom/directional/north,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"jIs" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -40151,9 +40206,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"jJc" = (
-/turf/closed/wall,
-/area/station/security/checkpoint/arrivals)
"jJe" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 1
@@ -40192,6 +40244,17 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark,
/area/station/service/library/lounge)
+"jJK" = (
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"jJM" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -40868,6 +40931,14 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"jQJ" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "Dormitories Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"jQL" = (
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
@@ -41110,6 +41181,21 @@
/obj/item/clothing/head/beret,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"jTR" = (
+/obj/structure/cable,
+/obj/machinery/computer/security{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/camera/directional/east{
+ c_tag = "Security Post - Arrivals"
+ },
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"jTY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41297,6 +41383,25 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"jWr" = (
+/obj/structure/rack,
+/obj/item/clothing/shoes/magboots{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/machinery/door/window/left/directional/west{
+ name = "Magboot Storage";
+ req_access = list("eva")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"jWG" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/beaker/large,
@@ -41809,10 +41914,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"kcv" = (
-/obj/structure/chair/sofa/left/brown,
-/turf/open/floor/wood/tile,
-/area/station/service/library/artgallery)
"kcH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43112,18 +43213,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
-"ktV" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "Xenobio Junction"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
-/turf/open/floor/iron,
-/area/station/maintenance/port)
"kub" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable/layer3,
@@ -43455,26 +43544,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"kyi" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/right/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"kyx" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
@@ -43538,22 +43607,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
-"kzm" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Robotics Junction"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/obj/effect/mapping_helpers/mail_sorting/science/robotics,
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/station/science/lobby)
"kzp" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -43815,6 +43868,17 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
+"kCA" = (
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/large,
+/area/station/medical/virology)
"kCI" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -44812,6 +44876,14 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
+"kPM" = (
+/obj/machinery/computer/order_console/cook,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/service/kitchen)
"kPQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -44920,19 +44992,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/security/prison/work)
-"kRz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- name = "Ordnance Junction"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
-/turf/open/floor/iron,
-/area/station/science/research)
"kRC" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair,
@@ -45645,13 +45704,6 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"laK" = (
-/obj/machinery/newscaster/directional/north,
-/obj/structure/chair/sofa/left/brown,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"laP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46190,6 +46242,16 @@
},
/turf/open/floor/carpet,
/area/station/command/meeting_room/council)
+"lgT" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"lgW" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/mapping_helpers/broken_floor,
@@ -46883,15 +46945,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"lqz" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table/wood,
-/obj/machinery/light_switch/directional/east,
-/obj/machinery/computer/libraryconsole{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"lqO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -47963,26 +48016,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"lEm" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "Kitchen Junction"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/loading_area{
- dir = 4
- },
-/obj/structure/sign/poster/random/directional/west,
-/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
-/turf/open/floor/iron,
-/area/station/maintenance/port/fore)
"lEn" = (
/turf/open/floor/iron/grimy,
/area/station/service/chapel)
@@ -48456,6 +48489,14 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"lJs" = (
+/obj/effect/landmark/secequipment,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"lJB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
@@ -48870,6 +48911,9 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"lOS" = (
+/turf/closed/wall,
+/area/station/security/checkpoint/arrivals)
"lOW" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -48911,6 +48955,14 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"lPi" = (
+/obj/structure/chair/sofa/right/brown,
+/obj/item/toy/plush/moth{
+ name = "Moffee"
+ },
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
"lPm" = (
/obj/machinery/telecomms/server/presets/service,
/obj/effect/turf_decal/tile/green/anticorner/contrasted,
@@ -49759,19 +49811,6 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
-"mcl" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "Quartermaster Junction"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/cargo,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"mcp" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
@@ -50360,17 +50399,6 @@
"mjz" = (
/turf/closed/wall,
/area/station/maintenance/starboard/lesser)
-"mjK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"mjT" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench/right{
@@ -50392,6 +50420,18 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark,
/area/station/science/circuits)
+"mko" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "Xenobio Junction"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
"mkB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50938,6 +50978,23 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/detectives_office)
+"msg" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/right/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"msj" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/button/door{
@@ -51593,14 +51650,6 @@
/obj/effect/spawner/random/engineering/material,
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
-"mAd" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/ai/directional/north,
-/obj/structure/chair/sofa/middle/brown,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"mAh" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52074,21 +52123,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"mFX" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor/right/directional/south{
- dir = 8;
- name = "Security Desk";
- pixel_x = -8;
- req_one_access = list("hop","security")
- },
-/obj/item/folder/red,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"mGi" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52416,6 +52450,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/corner,
/area/station/maintenance/disposal/incinerator)
+"mIP" = (
+/obj/structure/filingcabinet/security,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"mIX" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/disposalpipe/segment{
@@ -52661,12 +52702,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"mLL" = (
-/obj/structure/table/reinforced,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/coffeemaker/impressa,
-/turf/open/floor/wood,
-/area/station/engineering/break_room)
"mLP" = (
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
@@ -53263,6 +53298,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"mTf" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "Cargo Bay Junction"
+ },
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"mTn" = (
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/iron/grimy,
@@ -53316,6 +53362,14 @@
/obj/effect/turf_decal/loading_area,
/turf/open/floor/iron,
/area/station/command/teleporter)
+"mUW" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/chair/sofa/left/brown{
+ dir = 8
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/iron/white,
+/area/station/medical/paramedic)
"mUZ" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -53459,13 +53513,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"mWD" = (
-/obj/structure/chair/sofa/right/brown,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"mWE" = (
/obj/machinery/duct,
/obj/effect/decal/cleanable/dirt,
@@ -53880,12 +53927,6 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"nbN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"nbP" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance/two,
@@ -53942,6 +53983,22 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"ncC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green/half{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "Virology Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
+/turf/open/floor/iron/white/smooth_half{
+ dir = 1
+ },
+/area/station/medical/virology)
"ncE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54088,6 +54145,14 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
+"neY" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "Experimentor Lab Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"nfd" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
@@ -54305,6 +54370,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"nhJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"nhQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54465,6 +54540,15 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"nkl" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Pharmacy Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay)
"nkn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
@@ -55100,6 +55184,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"ntS" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/chair/sofa/right/brown{
+ dir = 8
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/iron/white,
+/area/station/medical/paramedic)
"ntU" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
@@ -55217,6 +55311,11 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"nvg" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/checkpoint/arrivals)
"nvo" = (
/obj/structure/railing{
dir = 4
@@ -55422,12 +55521,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/library)
-"nxY" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"nyb" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
@@ -55767,16 +55860,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"nBG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"nBJ" = (
/obj/machinery/door/poddoor/preopen{
id = "bridgedoors";
@@ -56634,6 +56717,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"nMk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"nMp" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible,
/obj/machinery/meter,
@@ -56739,6 +56829,15 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"nNJ" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"nNR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -57622,20 +57721,6 @@
/obj/structure/closet/secure_closet/security/science,
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
-"nZf" = (
-/obj/structure/cable,
-/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/warning{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "Medbay Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/general,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay)
"nZi" = (
/turf/closed/wall,
/area/station/service/library/private)
@@ -57644,19 +57729,6 @@
dir = 4
},
/area/station/commons/fitness/recreation)
-"nZo" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/effect/spawner/random/entertainment/cigarette_pack{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/storage/box/coffeepack{
- pixel_x = -13;
- pixel_y = 7
- },
-/turf/open/floor/wood,
-/area/station/engineering/break_room)
"nZt" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -58176,11 +58248,6 @@
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/cmo)
-"ogg" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/security/checkpoint/arrivals)
"ogj" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -59267,6 +59334,13 @@
/obj/item/pen,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"owa" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"owb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59737,33 +59811,6 @@
/obj/machinery/iv_drip,
/turf/open/floor/iron/grimy,
/area/station/maintenance/port/fore)
-"oCE" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/virology{
- autoclose = 0;
- frequency = 1449;
- id_tag = "virology_airlock_exterior";
- name = "Virology Exterior Airlock"
- },
-/obj/machinery/door_buttons/access_button{
- dir = 1;
- idDoor = "virology_airlock_exterior";
- idSelf = "virology_airlock_control";
- name = "Virology Access Button";
- pixel_x = -24;
- pixel_y = -2;
- req_access = list("virology")
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/medical/virology)
"oCG" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -59911,6 +59958,23 @@
/obj/structure/flora/bush/flowers_pp,
/turf/open/floor/grass,
/area/station/medical/virology)
+"oEn" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/right/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"oEC" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -60051,25 +60115,6 @@
"oGK" = (
/turf/closed/wall,
/area/station/service/chapel)
-"oGV" = (
-/obj/structure/rack,
-/obj/item/clothing/shoes/magboots{
- pixel_x = -4;
- pixel_y = 3
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/window/left/directional/west{
- name = "Magboot Storage";
- req_access = list("eva")
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"oGZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -60317,6 +60362,25 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"oKY" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/machinery/status_display/evac/directional/west,
+/obj/item/folder/white{
+ pixel_x = -6;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -6;
+ pixel_y = 13
+ },
+/obj/item/storage/box/coffeepack{
+ pixel_x = 8;
+ pixel_y = 17
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/break_room)
"oLd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/effect/decal/cleanable/dirt,
@@ -60697,6 +60761,13 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
+"oQj" = (
+/obj/structure/chair/sofa/right/brown,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"oQm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood/tile,
@@ -60749,6 +60820,12 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"oRf" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/disposalpipe/segment,
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark,
+/area/station/science/circuits)
"oRk" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -60759,6 +60836,26 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/commons/fitness/recreation)
+"oRm" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/right/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"oRs" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -60877,6 +60974,11 @@
/obj/effect/mapping_helpers/airlock/access/all/service/theatre,
/turf/open/floor/iron/dark,
/area/station/service/theater)
+"oSH" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/arrivals)
"oSK" = (
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
@@ -61001,6 +61103,29 @@
},
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"oUf" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door_buttons/airlock_controller{
+ idExterior = "virology_airlock_exterior";
+ idInterior = "virology_airlock_interior";
+ idSelf = "virology_airlock_control";
+ name = "Virology Access Console";
+ pixel_x = 24;
+ pixel_y = -24;
+ req_access = list("virology")
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"oUh" = (
/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
dir = 1
@@ -61039,14 +61164,6 @@
/obj/structure/sign/warning/electric_shock/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"oUz" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/chair/sofa/left/brown{
- dir = 8
- },
-/obj/effect/landmark/start/paramedic,
-/turf/open/floor/iron/white,
-/area/station/medical/paramedic)
"oUU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
@@ -62532,38 +62649,6 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"pol" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/virology{
- autoclose = 0;
- frequency = 1449;
- id_tag = "virology_airlock_interior";
- name = "Virology Interior Airlock"
- },
-/obj/machinery/door_buttons/access_button{
- idDoor = "virology_airlock_interior";
- idSelf = "virology_airlock_control";
- name = "Virology Access Button";
- pixel_y = 22;
- req_access = list("virology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"por" = (
/obj/structure/chair{
dir = 8
@@ -62628,6 +62713,14 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"ppP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"ppU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -62640,6 +62733,14 @@
/obj/structure/table_frame/wood,
/turf/open/floor/plating,
/area/station/service/library/abandoned)
+"pqk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/aft)
"pqm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -63123,17 +63224,6 @@
"pxb" = (
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
-"pxh" = (
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/large,
-/area/station/medical/virology)
"pxj" = (
/turf/open/floor/iron/white/corner,
/area/station/commons/fitness/recreation)
@@ -63325,20 +63415,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/fore)
-"pzt" = (
-/obj/structure/cable,
-/obj/machinery/computer/secure_data{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"pzu" = (
/obj/structure/cable,
/obj/structure/chair/office{
@@ -63857,23 +63933,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
-"pET" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/right/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"pEU" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -64153,6 +64212,14 @@
heat_capacity = 1e+006
},
/area/station/commons/locker)
+"pHR" = (
+/obj/structure/chair/sofa/left/brown{
+ dir = 8
+ },
+/obj/structure/sign/departments/psychology/directional/east,
+/obj/effect/landmark/start/psychologist,
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
"pIj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65395,6 +65462,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"pVv" = (
+/obj/structure/chair/sofa/left/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"pVw" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -65573,6 +65657,12 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"pXy" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/sign/warning/firing_range/directional/west,
+/obj/machinery/bci_implanter,
+/turf/open/floor/iron/dark,
+/area/station/science/circuits)
"pXK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65760,6 +65850,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"pZK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"qam" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -66870,6 +66973,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
+"qok" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail{
+ name = "Atmospherics Junction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"qoo" = (
/obj/structure/table/wood,
/obj/item/pai_card,
@@ -67230,12 +67345,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"qub" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/sign/warning/firing_range/directional/west,
-/obj/machinery/bci_implanter,
-/turf/open/floor/iron/dark,
-/area/station/science/circuits)
"quc" = (
/obj/machinery/telecomms/server/presets/common,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
@@ -67622,6 +67731,28 @@
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"qzh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_y = -24
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/turf/open/floor/engine,
+/area/station/maintenance/disposal/incinerator)
"qzn" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -67946,6 +68077,16 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
+"qCY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green/filled/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/vending/wallmed/directional/east,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"qDj" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -67993,29 +68134,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
-"qDT" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door_buttons/airlock_controller{
- idExterior = "virology_airlock_exterior";
- idInterior = "virology_airlock_interior";
- idSelf = "virology_airlock_control";
- name = "Virology Access Console";
- pixel_x = 24;
- pixel_y = -24;
- req_access = list("virology")
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"qDZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -68805,6 +68923,14 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/iron,
/area/station/service/library/lounge)
+"qMk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/aft)
"qMn" = (
/obj/structure/disposalpipe/trunk,
/obj/structure/disposaloutlet,
@@ -69054,6 +69180,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"qPv" = (
+/obj/structure/table/reinforced,
+/obj/item/book/manual/wiki/security_space_law,
+/obj/item/radio,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"qPw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/hangover,
@@ -69358,24 +69493,6 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
-"qUi" = (
-/obj/structure/disposalpipe/sorting/mail{
- name = "Engineering Junction"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/engineering/general,
-/turf/open/floor/iron,
-/area/station/engineering/main)
-"qUu" = (
-/obj/structure/chair/sofa/right/brown,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood/tile,
-/area/station/service/library/artgallery)
"qUw" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -69644,6 +69761,13 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"qZa" = (
+/obj/machinery/newscaster/directional/north,
+/obj/structure/chair/sofa/left/brown,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"qZb" = (
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall,
@@ -69759,6 +69883,12 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
+"rbd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"rbj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/barricade/wooden,
@@ -69991,6 +70121,17 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"rer" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/crowbar,
+/obj/item/restraints/handcuffs,
+/obj/machinery/recharger,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"rev" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -70237,22 +70378,6 @@
/obj/structure/flora/bush/lavendergrass/style_random,
/turf/open/misc/grass,
/area/station/hallway/primary/fore)
-"rhN" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/sign/warning/biohazard/directional/south,
-/obj/machinery/duct,
-/obj/machinery/light/small/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"rhV" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/south,
@@ -70284,27 +70409,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"riB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology{
- name = "Virology Access"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"riK" = (
/obj/structure/table_frame/wood,
/obj/item/crowbar/red,
@@ -71030,14 +71134,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
-"rqV" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/machinery/dna_infuser,
-/obj/item/infuser_book,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"rqW" = (
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
@@ -71383,24 +71479,6 @@
"rvK" = (
/turf/closed/wall,
/area/station/cargo/drone_bay)
-"rvQ" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/left/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"rvY" = (
/obj/machinery/dna_scannernew,
/obj/effect/turf_decal/bot,
@@ -71696,6 +71774,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"rzZ" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "Security Junction"
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/general,
+/turf/open/floor/iron,
+/area/station/security/office)
"rAc" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -71925,24 +72015,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"rCE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail{
- name = "CE's Junction"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/engineering/lobby)
"rCM" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -72028,6 +72100,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"rEi" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/structure/bed/dogbed/mcgriff,
+/mob/living/basic/pet/dog/pug/mcgriff,
+/turf/open/floor/iron,
+/area/station/security/warden)
"rEA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -72180,6 +72258,19 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/maintenance/disposal)
+"rGv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/engineering{
+ name = "Port Bow Solar Access"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/port/fore)
"rGO" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -72583,6 +72674,18 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"rLY" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/camera/directional/west{
+ c_tag = "Medbay - Break Room";
+ name = "medical camera";
+ network = list("ss13","medical")
+ },
+/obj/machinery/newscaster/directional/west,
+/obj/machinery/coffeemaker/impressa,
+/turf/open/floor/iron/dark,
+/area/station/medical/break_room)
"rMa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72821,14 +72924,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hos)
-"rOO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/right/directional/west{
- req_access = list("atmospherics")
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos/storage/gas)
"rOR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73304,18 +73399,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"rTG" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "Security Junction"
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/security/general,
-/turf/open/floor/iron,
-/area/station/security/office)
"rTH" = (
/obj/machinery/duct,
/obj/effect/turf_decal/trimline/yellow/corner{
@@ -73738,6 +73821,22 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"rYn" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"rYr" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -74090,20 +74189,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"sdw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"sdB" = (
/obj/item/kirbyplants/random,
/obj/machinery/status_display/evac/directional/west,
@@ -74128,6 +74213,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"sdM" = (
+/obj/structure/chair/sofa/left/brown,
+/turf/open/floor/wood/tile,
+/area/station/service/library/artgallery)
"sdO" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
dir = 1
@@ -74333,6 +74422,17 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"sgL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"sgZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -74764,6 +74864,24 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"smH" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/left/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"smJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -74850,12 +74968,6 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/engineering/atmos/storage/gas)
-"sob" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/disposalpipe/segment,
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron/dark,
-/area/station/science/circuits)
"sog" = (
/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
dir = 8
@@ -74895,19 +75007,6 @@
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
-"spd" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "Genetics Junction"
- },
-/obj/structure/cable,
-/obj/machinery/duct,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/mail_sorting/science/genetics,
-/turf/open/floor/iron,
-/area/station/science/research)
"spq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
@@ -76967,6 +77066,17 @@
/obj/effect/landmark/navigate_destination/hydro,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"sNM" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1;
+ name = "CMO Junction"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay)
"sNN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -77066,6 +77176,20 @@
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"sPI" = (
+/obj/structure/cable,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"sPO" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -78032,16 +78156,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"taa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/green/filled/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/vending/wallmed/directional/east,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"tax" = (
/turf/closed/wall,
/area/station/engineering/break_room)
@@ -78480,17 +78594,6 @@
"tgT" = (
/turf/closed/wall/r_wall,
/area/station/medical/virology)
-"tgU" = (
-/obj/structure/cable,
-/obj/effect/landmark/start/hangover,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "Theater Junction"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/mail_sorting/service/theater,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"thf" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -78925,20 +79028,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"toI" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "HoP Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/command)
"toR" = (
/obj/structure/window/reinforced{
dir = 8
@@ -79739,6 +79828,18 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
+"txf" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"txi" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -79767,14 +79868,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
-"txX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/aft)
"tyj" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/reinforced,
@@ -80146,6 +80239,25 @@
},
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
+"tCO" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/right/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"tCQ" = (
/obj/effect/turf_decal/loading_area{
dir = 4
@@ -80286,6 +80398,15 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"tDW" = (
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"tEd" = (
/obj/machinery/flasher/directional/south{
id = "AI";
@@ -80623,14 +80744,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"tJh" = (
-/obj/structure/chair/sofa/left/brown{
- dir = 8
- },
-/obj/structure/sign/departments/psychology/directional/east,
-/obj/effect/landmark/start/psychologist,
-/turf/open/floor/carpet/blue,
-/area/station/medical/psychology)
"tJi" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -80966,6 +81079,33 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"tMY" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/virology{
+ autoclose = 0;
+ frequency = 1449;
+ id_tag = "virology_airlock_exterior";
+ name = "Virology Exterior Airlock"
+ },
+/obj/machinery/door_buttons/access_button{
+ dir = 1;
+ idDoor = "virology_airlock_exterior";
+ idSelf = "virology_airlock_control";
+ name = "Virology Access Button";
+ pixel_x = -24;
+ pixel_y = -2;
+ req_access = list("virology")
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/medical/virology)
"tNa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -81206,6 +81346,14 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/station/security/prison)
+"tPb" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/dna_infuser,
+/obj/item/infuser_book,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"tPc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -81463,34 +81611,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
-"tSU" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 6
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
-"tTa" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "Cargo Bay Junction"
- },
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"tTb" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -81810,28 +81930,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
-"tXn" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/left/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"tXu" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -81883,6 +81981,38 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"tXN" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/virology{
+ autoclose = 0;
+ frequency = 1449;
+ id_tag = "virology_airlock_interior";
+ name = "Virology Interior Airlock"
+ },
+/obj/machinery/door_buttons/access_button{
+ idDoor = "virology_airlock_interior";
+ idSelf = "virology_airlock_control";
+ name = "Virology Access Button";
+ pixel_y = 22;
+ req_access = list("virology")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"tXO" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron,
@@ -82764,6 +82894,12 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"uhT" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/arrivals)
"uhX" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -82934,6 +83070,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"ukf" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/arrivals)
"ukn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -83122,16 +83263,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
-"umM" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/chair/sofa/right/brown{
- dir = 8
- },
-/obj/effect/landmark/start/paramedic,
-/turf/open/floor/iron/white,
-/area/station/medical/paramedic)
"umN" = (
/turf/closed/wall,
/area/station/commons/vacant_room)
@@ -83183,20 +83314,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay)
-"unv" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/effect/turf_decal/trimline/green/filled/warning{
- dir = 5
- },
-/obj/machinery/light_switch/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"unx" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
@@ -83331,17 +83448,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"upq" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/aft)
"upB" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -83394,17 +83500,6 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"uqK" = (
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"uqX" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random/directional/north,
@@ -84001,21 +84096,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"uyt" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "Disposals Junction"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"uyx" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/dinnerware,
@@ -84500,6 +84580,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"uEi" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/arrivals)
"uEo" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
@@ -84825,14 +84912,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"uJa" = (
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"uJk" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/landmark/start/hangover,
@@ -85914,15 +85993,6 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"uWL" = (
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light_switch/directional/west,
-/obj/machinery/vending/wardrobe/sec_wardrobe,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"uWN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -86152,6 +86222,24 @@
},
/turf/open/floor/iron,
/area/station/science/research)
+"uZy" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/sofa/left/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
"uZH" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -86454,14 +86542,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
-"vda" = (
-/obj/structure/table,
-/obj/machinery/computer/libraryconsole/bookmanagement{
- dir = 1
- },
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vdd" = (
/obj/item/radio/intercom/directional/north,
/obj/structure/cable,
@@ -87147,6 +87227,13 @@
"vmt" = (
/turf/closed/wall/r_wall,
/area/station/engineering/transit_tube)
+"vmC" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"vmK" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/yellow,
@@ -87499,31 +87586,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"vqx" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = -6;
- pixel_y = -24
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = 8;
- pixel_y = -24
- },
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_y = 32
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"vqy" = (
/obj/machinery/door/airlock{
name = "Vacant Room"
@@ -88037,23 +88099,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"vwr" = (
-/obj/structure/chair/sofa/left/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"vwv" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -88132,6 +88177,19 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"vxq" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "Genetics Junction"
+ },
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/mail_sorting/science/genetics,
+/turf/open/floor/iron,
+/area/station/science/research)
"vxr" = (
/turf/open/floor/iron,
/area/station/security/prison)
@@ -88915,13 +88973,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"vFU" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"vGc" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -89113,22 +89164,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
-"vJm" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green/half{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "Virology Junction"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
-/turf/open/floor/iron/white/smooth_half{
- dir = 1
- },
-/area/station/medical/virology)
"vJD" = (
/obj/structure/table/wood,
/obj/machinery/newscaster/directional/west,
@@ -89477,15 +89512,6 @@
/obj/machinery/light/warm/directional/south,
/turf/open/floor/wood/tile,
/area/station/service/library/artgallery)
-"vPl" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/radio,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"vPn" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -90273,6 +90299,21 @@
dir = 1
},
/area/station/engineering/atmos)
+"vZD" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/right/directional/south{
+ dir = 8;
+ name = "Security Desk";
+ pixel_x = -8;
+ req_one_access = list("hop","security")
+ },
+/obj/item/folder/red,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"vZE" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
@@ -90433,6 +90474,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"wbz" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/table/wood,
+/obj/item/radio/intercom/directional/north,
+/obj/item/newspaper{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"wbA" = (
/obj/machinery/light/directional/south,
/obj/machinery/camera/directional/south{
@@ -90882,6 +90937,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"wgQ" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "Theater Junction"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/mail_sorting/service/theater,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"wgU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/small/directional/east,
@@ -91126,6 +91192,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"wjC" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"wjF" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
@@ -91513,18 +91587,6 @@
/obj/item/screwdriver,
/turf/open/floor/iron,
/area/station/medical/pharmacy)
-"wnD" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"wnF" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -92265,12 +92327,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
-"wuF" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/arrivals)
"wuZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -92441,6 +92497,16 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/ordnance)
+"wwR" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "Janitor Junction"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"wwV" = (
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
@@ -92579,20 +92645,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"wzd" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/table/wood,
-/obj/item/radio/intercom/directional/north,
-/obj/item/newspaper{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/cup/glass/coffee{
- pixel_x = -4;
- pixel_y = 2
- },
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"wzl" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/red{
@@ -93579,6 +93631,15 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/medical/pharmacy)
+"wLq" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "HoS Junction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
+/turf/open/floor/iron,
+/area/station/security/office)
"wLK" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -93983,24 +94044,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
-"wSk" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/sofa/left/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
"wSv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -94061,28 +94104,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"wTc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_y = -24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
"wTg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -94193,13 +94214,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
-"wVa" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/newscaster/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/arrivals)
"wVd" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -94807,6 +94821,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
+"xdR" = (
+/obj/structure/window/reinforced,
+/obj/machinery/vending/wardrobe/robo_wardrobe,
+/obj/effect/turf_decal/bot,
+/obj/structure/fireaxecabinet/mechremoval/directional/west,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"xdY" = (
/obj/structure/cable,
/obj/machinery/computer/cargo/request,
@@ -94978,6 +94999,12 @@
/obj/structure/flora/bush/jungle/a/style_random,
/turf/open/floor/grass,
/area/station/hallway/secondary/exit/departure_lounge)
+"xfA" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/arrivals)
"xfE" = (
/obj/structure/lattice/catwalk,
/obj/structure/sign/nanotrasen{
@@ -96098,13 +96125,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"xvo" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"xvr" = (
/obj/machinery/power/smes,
/obj/structure/cable,
@@ -96226,14 +96246,6 @@
/obj/item/book/manual/wiki/engineering_hacking,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"xxd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/arrivals)
"xxf" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
@@ -98137,20 +98149,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"xTV" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "RD Junction"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/machinery/duct,
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
-/turf/open/floor/iron/large,
-/area/station/science/research)
"xTW" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/grimy,
@@ -98788,6 +98786,20 @@
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"ybY" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/effect/turf_decal/trimline/green/filled/warning{
+ dir = 5
+ },
+/obj/machinery/light_switch/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"yca" = (
/obj/item/food/pie/cream,
/obj/structure/table,
@@ -99365,18 +99377,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hos)
-"yki" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail{
- name = "Atmospherics Junction"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"ykl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -120429,7 +120429,7 @@ kvq
qYo
edx
edx
-wTc
+qzh
edx
edx
ltx
@@ -122268,7 +122268,7 @@ lKe
nZW
qAz
vQj
-mLL
+dsH
agA
uzb
jLx
@@ -122525,7 +122525,7 @@ ciD
vYI
lpv
vQj
-nZo
+dos
gsf
miE
tgl
@@ -123512,7 +123512,7 @@ ixO
gKT
tHf
rxW
-fAS
+rGv
xDX
gZW
rNo
@@ -123561,7 +123561,7 @@ ygM
fzF
ocr
sys
-rCE
+ioK
uWj
iBR
sQr
@@ -124371,7 +124371,7 @@ qLu
gSe
fKv
qsC
-duK
+bBI
cgJ
fWq
nqD
@@ -125368,7 +125368,7 @@ kpn
sgZ
sKo
dwv
-qUi
+dIo
wuz
qqG
iKD
@@ -126675,7 +126675,7 @@ vBj
wKF
qBN
pTC
-ktV
+mko
slW
wse
dXr
@@ -127146,7 +127146,7 @@ qYo
haF
aaa
xLZ
-rOO
+crX
xLZ
xLZ
xLZ
@@ -127922,7 +127922,7 @@ pjp
vBB
ljK
lQP
-yki
+qok
ljK
ljK
ljK
@@ -128926,7 +128926,7 @@ prn
lTp
nLF
ocV
-jFb
+ggn
oYs
aaa
aaa
@@ -129457,7 +129457,7 @@ svz
ofg
vVe
itn
-lEm
+etl
fnb
xiV
mbR
@@ -129522,7 +129522,7 @@ urt
awA
cmd
jqt
-qub
+pXy
vka
elq
pDi
@@ -130009,14 +130009,14 @@ pTC
unj
hyg
eCO
-hfs
+xdR
iCI
pTC
jqk
wjI
vcB
qcM
-axm
+neY
qvq
bKu
uuJ
@@ -130293,7 +130293,7 @@ urt
mjW
lPM
rni
-sob
+oRf
cPw
fJF
kiz
@@ -130981,7 +130981,7 @@ sao
ueJ
bIG
csw
-frR
+kPM
cIa
ddg
uWI
@@ -131319,7 +131319,7 @@ snc
uaT
xcD
wPe
-kRz
+iNQ
eNE
xXR
hIB
@@ -131573,7 +131573,7 @@ muW
paQ
nKA
dSs
-xTV
+bYw
paQ
rOX
oVX
@@ -132101,7 +132101,7 @@ sBE
hkU
qgo
qaA
-vqx
+etV
oHM
iLH
pKR
@@ -132586,7 +132586,7 @@ hlv
wxg
hlv
bRm
-kzm
+ckg
mUt
xeC
mUt
@@ -134399,7 +134399,7 @@ hnq
fXw
pvX
inR
-izq
+bPi
bXG
oxP
aAj
@@ -135171,7 +135171,7 @@ pJs
bMj
dfA
lrF
-spd
+vxq
nyE
oiW
cQn
@@ -135347,8 +135347,8 @@ vRB
dcR
giz
kVP
-wSk
-ixs
+uZy
+tCO
aGF
mgn
fto
@@ -135356,8 +135356,8 @@ qPw
fto
pkr
ffo
-tXn
-icn
+jsW
+oEn
vnU
uqX
mOI
@@ -135720,8 +135720,8 @@ aaa
iid
flP
kfk
-pxh
-cJw
+kCA
+iRt
aMf
gff
aMf
@@ -135850,7 +135850,7 @@ qYo
aaa
qld
fNv
-eQd
+wwR
xWc
oDm
cnL
@@ -135861,8 +135861,8 @@ oFh
ygD
feG
kVP
-pET
-vwr
+msg
+pVv
aWP
rpZ
ePa
@@ -135870,8 +135870,8 @@ uYg
uYg
pmS
kXO
-kyi
-rvQ
+oRm
+smH
vnU
vnU
vCy
@@ -135975,9 +135975,9 @@ uYH
qQM
qYo
tgT
-unv
-mjK
-taa
+ybY
+sgL
+qCY
xFJ
ejL
jlv
@@ -136112,7 +136112,7 @@ dFS
tCs
vdZ
qPp
-cfd
+hvp
kVP
ovQ
joU
@@ -136172,7 +136172,7 @@ mXy
guY
hYb
beG
-toI
+dLS
dEc
qGJ
tSo
@@ -136232,7 +136232,7 @@ uYH
qQM
uXF
tgT
-riB
+dYF
tgT
tgT
gqm
@@ -136398,7 +136398,7 @@ bKn
cHB
sLa
jZT
-tgU
+wgQ
dOZ
xms
aaa
@@ -136424,7 +136424,7 @@ lZx
wqG
lbt
iVT
-ijp
+gsv
njs
cqt
wPk
@@ -136445,7 +136445,7 @@ whK
rcW
tXO
wYH
-rqV
+tPb
bSZ
yjK
hVy
@@ -136489,7 +136489,7 @@ bMV
qQM
qYo
tgT
-sdw
+inD
tgT
vvb
hlG
@@ -136691,7 +136691,7 @@ drM
mlE
odw
kdL
-oGV
+jWr
fot
rCj
wDQ
@@ -136746,7 +136746,7 @@ bJA
qQM
aaa
gqm
-rhN
+dBV
tgT
xWi
vjI
@@ -137003,7 +137003,7 @@ ejE
qQM
qYo
tgT
-qDT
+oUf
tgT
oEd
esG
@@ -137260,7 +137260,7 @@ vsy
qQM
tgT
tgT
-pol
+tXN
tgT
tgT
bla
@@ -137513,11 +137513,11 @@ riS
iAY
lwZ
lEq
-vJm
-fTx
+ncC
+lgT
tgT
vKI
-iFg
+rYn
geU
tgT
lkE
@@ -137771,10 +137771,10 @@ sHK
wzO
nmy
yjG
-uJa
-oCE
-wnD
-tSU
+cvd
+tMY
+txf
+gsu
mNK
tgT
tgT
@@ -138262,11 +138262,11 @@ dUF
anX
fcI
eYX
-nZf
+dNB
lyZ
jQY
jQY
-fqz
+sNM
rRE
vUz
fLJ
@@ -138411,14 +138411,14 @@ qld
qso
dJO
szM
-jJc
-wuF
-fcR
-amp
-fcR
-gdb
-wVa
-jJc
+lOS
+uhT
+oSH
+ceX
+oSH
+ukf
+uEi
+lOS
xCf
dIk
hjm
@@ -138668,14 +138668,14 @@ fZV
rbR
kJd
lrO
-jJc
-jJc
-ogg
-ogg
-ogg
-uqK
-jJc
-jJc
+lOS
+lOS
+nvg
+nvg
+nvg
+jJK
+lOS
+lOS
ulQ
iWA
rkS
@@ -138765,7 +138765,7 @@ wIJ
fLP
jQg
gbG
-jyJ
+nkl
kNT
qaL
veM
@@ -138925,14 +138925,14 @@ qld
rbR
kJd
wJT
-jJc
-uWL
-xvo
-gfl
-vPl
-mFX
-eBb
-jJc
+lOS
+tDW
+owa
+nNJ
+qPv
+vZD
+mIP
+lOS
xbp
prJ
anF
@@ -138952,7 +138952,7 @@ miQ
tvG
sEn
wNk
-eVk
+iWx
qAV
qAV
qAV
@@ -139182,14 +139182,14 @@ qld
rbR
oPi
ekp
-ogg
-hmS
-vFU
-xxd
-nBG
-bAY
-nbN
-dLX
+nvg
+rer
+nMk
+ppP
+nhJ
+hDG
+rbd
+eXV
eCt
bHB
rza
@@ -139439,14 +139439,14 @@ sjt
dBg
kJd
gaF
-jJc
-aje
-arc
-jyA
-aoS
-pzt
-nxY
-jJc
+lOS
+jIn
+vmC
+wjC
+jTR
+sPI
+xfA
+lOS
jdL
gPc
jdL
@@ -141103,8 +141103,8 @@ lvZ
rtC
idd
fPh
-eOE
-dIJ
+rLY
+oKY
yho
lvZ
tOv
@@ -142036,7 +142036,7 @@ pdB
lTg
uQa
xqM
-tTa
+mTf
lKl
mQt
tfC
@@ -142121,7 +142121,7 @@ gtp
mJE
hHW
oDE
-eTK
+lPi
niN
xpW
kfE
@@ -142366,8 +142366,8 @@ lAk
tfK
gQl
auy
-umM
-oUz
+ntS
+mUW
gOM
gQl
cwe
@@ -142378,8 +142378,8 @@ fUr
bcj
pDy
oDE
-ajY
-tJh
+hKO
+pHR
hVV
bVQ
kAd
@@ -143051,7 +143051,7 @@ cxv
joP
jnd
udk
-uyt
+eTA
iRP
fmJ
bqv
@@ -143132,7 +143132,7 @@ mLf
oZL
blR
kEM
-bwM
+fvV
oZL
oZL
oZL
@@ -143321,7 +143321,7 @@ wQN
oSv
uvH
wqo
-mcl
+aWm
dbx
cwt
jIa
@@ -145127,7 +145127,7 @@ jrz
xZC
iIj
aJE
-jCu
+dzK
iio
mDm
eYt
@@ -145719,7 +145719,7 @@ hlM
hlM
fHm
bcT
-iBX
+jvR
wMU
qZC
kbn
@@ -145963,7 +145963,7 @@ nHY
bXX
jEN
teU
-qUu
+hfI
gZU
vVR
uNf
@@ -146220,7 +146220,7 @@ nHY
bXX
jEN
teU
-kcv
+sdM
gZU
vVR
uNf
@@ -146695,7 +146695,7 @@ rlC
rlC
mDH
mGt
-gvo
+pZK
huv
eMG
iVq
@@ -147239,7 +147239,7 @@ ptI
kHk
eAA
dfZ
-mWD
+oQj
nHY
phX
lLJ
@@ -147496,7 +147496,7 @@ mOy
mEh
qEj
dfZ
-mAd
+hMz
rop
oQd
nHY
@@ -147753,7 +147753,7 @@ pru
qaE
wAZ
dfZ
-laK
+qZa
xBw
nxR
nxR
@@ -147990,7 +147990,7 @@ mON
xTW
gCY
jCO
-gyZ
+hZW
jos
rYA
kaG
@@ -148267,8 +148267,8 @@ dfZ
dfZ
dfZ
dfZ
-wzd
-lqz
+wbz
+ehn
bwr
nxR
lLJ
@@ -151562,7 +151562,7 @@ eVE
nzR
gKp
gDP
-rTG
+rzZ
nsG
ozu
dql
@@ -151820,7 +151820,7 @@ mIb
jkw
xRF
wdM
-cbX
+wLq
one
tOm
vSt
@@ -151871,8 +151871,8 @@ ouy
geH
nXH
gWF
-upq
-jix
+bCf
+jQJ
nmD
gQK
gQK
@@ -152095,7 +152095,7 @@ rIa
rIa
rIa
rSc
-axo
+rEi
lra
cgZ
qiM
@@ -152128,8 +152128,8 @@ ouy
fjQ
nXH
aUp
-fwK
-txX
+qMk
+pqk
cGJ
cGJ
nXj
@@ -152824,7 +152824,7 @@ gOo
bfs
jdT
vxr
-vda
+gYt
iOc
qdg
iOc
@@ -153875,7 +153875,7 @@ tAj
oSd
sMX
bRG
-bfS
+lJs
gNx
aQD
iDq
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index aedc27b42a8..b89c8cc34b4 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -145,6 +145,11 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
+"acP" = (
+/obj/structure/chair/sofa/corner/brown,
+/obj/structure/cable,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"adr" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -4008,15 +4013,6 @@
/obj/machinery/vending/dinnerware,
/turf/open/floor/iron/kitchen/diagonal,
/area/station/service/kitchen)
-"bms" = (
-/obj/machinery/computer/order_console/mining,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/light_switch/directional/south,
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/mine/production)
"bmv" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -4252,17 +4248,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"bps" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/chair/sofa/left/brown{
- desc = "Hey, did you know you can get a pineapple on your burger here?";
- dir = 1;
- name = "The Regular's Sofa"
- },
-/turf/open/floor/stone,
-/area/station/commons/lounge)
"bpD" = (
/obj/machinery/newscaster/directional/south,
/obj/structure/closet/firecloset,
@@ -4504,6 +4489,17 @@
},
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"bsR" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = 24
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"bsV" = (
/obj/structure/window/reinforced{
dir = 1
@@ -7394,12 +7390,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"cih" = (
-/obj/structure/chair/sofa/left/brown,
-/obj/machinery/light/directional/north,
-/obj/effect/landmark/start/psychologist,
-/turf/open/floor/carpet/blue,
-/area/station/medical/psychology)
"cin" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -7442,6 +7432,17 @@
/obj/effect/spawner/random/trash/cigbutt,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
+"cjd" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/south,
+/obj/structure/chair/sofa/left/brown{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/break_room)
"cjj" = (
/obj/machinery/holopad,
/turf/open/floor/wood/parquet,
@@ -8112,6 +8113,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"cuh" = (
+/obj/structure/chair/sofa/left/brown{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/obj/structure/cable,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"cum" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 1
@@ -11847,32 +11856,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"dyO" = (
-/obj/structure/table,
-/obj/item/storage/box/monkeycubes{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/storage/box/monkeycubes{
- pixel_x = -5
- },
-/obj/item/storage/box/bodybags{
- pixel_x = -1;
- pixel_y = 6
- },
-/obj/item/storage/box/disks{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/storage/box/monkeycubes{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/storage/box/monkeycubes{
- pixel_x = -5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"dyQ" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/light/directional/south,
@@ -12882,6 +12865,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/mine/storage)
+"dOt" = (
+/obj/structure/chair/sofa/right/brown,
+/obj/item/toy/plush/moth{
+ name = "Dr. Moff"
+ },
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
"dOw" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -15148,6 +15138,13 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"eAI" = (
+/obj/structure/bed/dogbed/ian,
+/mob/living/basic/pet/dog/corgi/ian{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/hop)
"eAS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18953,16 +18950,6 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
-"fIv" = (
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_x = -24
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
"fIH" = (
/obj/structure/closet/lasertag/red,
/obj/effect/spawner/random/contraband/permabrig_gear,
@@ -19341,15 +19328,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"fPs" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/machinery/light_switch/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/cargo/miningdock)
"fPt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -19579,15 +19557,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"fTu" = (
-/obj/structure/chair/sofa/right/brown{
- desc = "Hey, did you know you can get a pineapple on your burger here?";
- dir = 1;
- name = "The Regular's Sofa"
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/stone,
-/area/station/commons/lounge)
"fTx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -21850,6 +21819,19 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"gEl" = (
+/obj/structure/chair/sofa/right/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/service)
"gEn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22465,13 +22447,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/command/heads_quarters/cmo)
-"gOc" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/chair/sofa/right/brown,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"gOx" = (
/obj/effect/turf_decal/loading_area,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -23749,6 +23724,17 @@
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
+"hiB" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/chair/sofa/right/brown{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/south,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/grimy,
+/area/station/commons/lounge)
"hiF" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/white,
@@ -23880,6 +23866,10 @@
/obj/item/bikehorn/rubberducky,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"hlz" = (
+/obj/structure/chair/sofa/middle/brown,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"hlJ" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -24308,14 +24298,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
-"hsE" = (
-/obj/structure/chair/sofa/left/brown{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/obj/structure/cable,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"hsI" = (
/turf/closed/wall,
/area/station/construction/mining/aux_base)
@@ -24716,17 +24698,6 @@
/obj/structure/sink/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"hyS" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/machinery/light/small/directional/south,
-/obj/structure/chair/sofa/left/brown{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/medical/break_room)
"hyV" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/testlab)
@@ -26099,19 +26070,6 @@
/obj/structure/cable,
/turf/open/floor/carpet/red,
/area/station/security/prison/work)
-"hXp" = (
-/obj/structure/chair/sofa/right/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/service)
"hXU" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -27730,13 +27688,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/cryo)
-"ixm" = (
-/obj/structure/chair/sofa/right/brown,
-/obj/item/toy/plush/moth{
- name = "Dr. Moff"
- },
-/turf/open/floor/carpet/blue,
-/area/station/medical/psychology)
"ixu" = (
/obj/machinery/camera/directional/north{
c_tag = "Teleporter"
@@ -27766,6 +27717,13 @@
},
/turf/open/floor/iron/large,
/area/station/engineering/main)
+"ixV" = (
+/obj/structure/bed/dogbed/mcgriff,
+/obj/item/food/beef_wellington_slice,
+/obj/structure/cable,
+/mob/living/basic/pet/dog/pug/mcgriff,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/warden)
"ixZ" = (
/obj/machinery/door/airlock/command/glass{
name = "Chief Engineer"
@@ -28216,13 +28174,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/smooth_half,
/area/station/security/prison/work)
-"iFg" = (
-/obj/structure/bed/dogbed/mcgriff,
-/obj/item/food/beef_wellington_slice,
-/obj/structure/cable,
-/mob/living/simple_animal/pet/dog/pug/mcgriff,
-/turf/open/floor/iron/showroomfloor,
-/area/station/security/warden)
"iFm" = (
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/dirt/dust,
@@ -29742,6 +29693,17 @@
/obj/structure/chair/comfy/beige,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
+"jbn" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/chair/sofa/left/brown{
+ desc = "Hey, did you know you can get a pineapple on your burger here?";
+ dir = 1;
+ name = "The Regular's Sofa"
+ },
+/turf/open/floor/stone,
+/area/station/commons/lounge)
"jbt" = (
/obj/machinery/light/directional/north,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -32708,13 +32670,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"jXB" = (
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/ian{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
"jXD" = (
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
@@ -37441,17 +37396,6 @@
dir = 8
},
/area/station/maintenance/port/fore)
-"lsl" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/sofa/right/brown{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/grimy,
-/area/station/commons/lounge)
"lso" = (
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
@@ -37686,15 +37630,6 @@
"lwR" = (
/turf/closed/wall/r_wall,
/area/mine/living_quarters)
-"lwS" = (
-/obj/machinery/computer/order_console/cook{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/hallway/secondary/service)
"lxc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -38414,14 +38349,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
-"lKf" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
-/turf/open/floor/iron/dark,
-/area/station/cargo/miningdock)
"lKk" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -39984,6 +39911,13 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
+"mmN" = (
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/chair/sofa/right/brown,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"mmR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41928,6 +41862,14 @@
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"mVT" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/turf/open/floor/iron/dark,
+/area/station/cargo/miningdock)
"mVY" = (
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -44681,6 +44623,17 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"nJi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/chair/sofa/left/brown{
+ dir = 1
+ },
+/obj/effect/landmark/start/hangover,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/grimy,
+/area/station/commons/lounge)
"nJm" = (
/obj/structure/fluff/fokoff_sign,
/turf/open/misc/asteroid/snow/icemoon,
@@ -46758,6 +46711,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"ont" = (
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_x = -24
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/turf/open/floor/engine,
+/area/station/maintenance/disposal/incinerator)
"onv" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -48139,6 +48102,15 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"oJU" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/cargo/miningdock)
"oKv" = (
/obj/item/trash/popcorn,
/turf/open/floor/plating,
@@ -53741,6 +53713,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"qAO" = (
+/obj/structure/chair/sofa/left/brown,
+/obj/machinery/light/directional/north,
+/obj/effect/landmark/start/psychologist,
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
"qAQ" = (
/turf/open/floor/engine/vacuum,
/area/station/engineering/atmos)
@@ -55541,11 +55519,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
-"raG" = (
-/obj/machinery/dna_infuser,
-/obj/item/infuser_book,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"raH" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/mapping_helpers/broken_floor,
@@ -56445,11 +56418,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/hallway/primary/starboard)
-"rrv" = (
-/obj/structure/chair/sofa/corner/brown,
-/obj/structure/cable,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"rrx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57454,6 +57422,17 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
+"rHF" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Mining Bunks";
+ dir = 6
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/mine/production)
"rHH" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/snack/lizard,
@@ -58474,6 +58453,32 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rZC" = (
+/obj/structure/table,
+/obj/item/storage/box/monkeycubes{
+ pixel_x = 6;
+ pixel_y = 7
+ },
+/obj/item/storage/box/monkeycubes{
+ pixel_x = -5
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = -1;
+ pixel_y = 6
+ },
+/obj/item/storage/box/disks{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/storage/box/monkeycubes{
+ pixel_x = 6;
+ pixel_y = 7
+ },
+/obj/item/storage/box/monkeycubes{
+ pixel_x = -5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"rZE" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8
@@ -58705,6 +58710,19 @@
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"sdk" = (
+/obj/structure/chair/sofa/left/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/service)
"sdl" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 5
@@ -58876,6 +58894,22 @@
dir = 5
},
/area/station/science/research)
+"sgt" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/sofa/right/brown{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/break_room)
"sgA" = (
/obj/effect/turf_decal/box,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60234,17 +60268,6 @@
/obj/machinery/chem_mass_spec,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"sAU" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera{
- c_tag = "Mining Bunks";
- dir = 6
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/mine/production)
"sAV" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -64224,6 +64247,15 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/mine/laborcamp)
+"tMC" = (
+/obj/machinery/computer/order_console/mining,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/light_switch/directional/south,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/mine/production)
"tMD" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -64546,19 +64578,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"tSj" = (
-/obj/structure/chair/sofa/left/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/service)
"tSs" = (
/obj/item/flashlight/lantern{
on = 1
@@ -66161,6 +66180,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/research)
+"urO" = (
+/obj/machinery/computer/order_console/cook{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/service)
"uso" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/contraband/prison,
@@ -69109,17 +69137,6 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"vpK" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/sofa/left/brown{
- dir = 1
- },
-/obj/effect/landmark/start/hangover,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/grimy,
-/area/station/commons/lounge)
"vpR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
@@ -70670,10 +70687,6 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"vOJ" = (
-/obj/structure/chair/sofa/middle/brown,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"vPh" = (
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
@@ -71017,17 +71030,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"vTB" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_x = 24
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"vTJ" = (
/obj/structure/table,
/obj/item/toy/plush/slimeplushie{
@@ -74828,22 +74830,6 @@
"wZj" = (
/turf/open/floor/iron/dark/textured,
/area/station/security/warden)
-"wZl" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/sofa/right/brown{
- dir = 1
- },
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/break_room)
"wZp" = (
/obj/item/storage/toolbox/electrical{
pixel_x = 4;
@@ -76020,6 +76006,11 @@
/obj/effect/mapping_helpers/airlock/access/all/service/general,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/secondary/service)
+"xqN" = (
+/obj/machinery/dna_infuser,
+/obj/item/infuser_book,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"xqY" = (
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
@@ -78475,6 +78466,15 @@
/obj/machinery/computer/holodeck,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"yfZ" = (
+/obj/structure/chair/sofa/right/brown{
+ desc = "Hey, did you know you can get a pineapple on your burger here?";
+ dir = 1;
+ name = "The Regular's Sofa"
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/stone,
+/area/station/commons/lounge)
"ygd" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -164037,8 +164037,8 @@ pve
vSi
kZu
pAT
-sAU
-bms
+rHF
+tMC
kZu
aNg
kzH
@@ -169345,7 +169345,7 @@ iDt
hPs
gBX
hPs
-gOc
+mmN
vxM
vnT
una
@@ -169602,7 +169602,7 @@ iDt
iDt
iDt
oqL
-vOJ
+hlz
gBc
erY
clR
@@ -169859,8 +169859,8 @@ iDt
iDt
iDt
oqL
-rrv
-hsE
+acP
+cuh
pdT
klv
cIc
@@ -179409,8 +179409,8 @@ udC
udC
xMq
mdZ
-tSj
-hXp
+sdk
+gEl
mdZ
oGR
pIQ
@@ -179681,7 +179681,7 @@ ydZ
jBU
mqr
mqr
-vpK
+nJi
dMS
rZN
cjK
@@ -179938,7 +179938,7 @@ lrN
jBU
eDi
doJ
-lsl
+hiB
dMS
dre
dMS
@@ -181736,7 +181736,7 @@ hzQ
hzQ
nro
hzQ
-bps
+jbn
dMS
dEB
dMS
@@ -181993,7 +181993,7 @@ wun
dOQ
lZG
fDt
-fTu
+yfZ
dMS
dEB
dMS
@@ -193848,7 +193848,7 @@ sDA
mYd
mIC
aWs
-vTB
+bsR
qSk
qSk
rEh
@@ -229568,8 +229568,8 @@ ajw
maT
maT
qjQ
-fPs
-lKf
+oJU
+mVT
qjQ
fZb
qjQ
@@ -236444,7 +236444,7 @@ cMA
wkr
eRO
ven
-iFg
+ixV
kyy
kTz
lbk
@@ -236756,7 +236756,7 @@ cqQ
jRC
nvs
edW
-jXB
+eAI
cpm
bHy
ylU
@@ -245979,7 +245979,7 @@ gzw
kiB
kQX
xLn
-lwS
+urO
mdZ
rth
hid
@@ -248620,7 +248620,7 @@ uqH
qXk
qSC
ldr
-fIv
+ont
mgD
pmb
hPD
@@ -249112,7 +249112,7 @@ tQc
tQc
qQp
hRA
-ixm
+dOt
rkL
cga
rTv
@@ -249369,7 +249369,7 @@ iML
iML
nHX
hRA
-cih
+qAO
rkL
uFz
kJC
@@ -250912,7 +250912,7 @@ dpr
klk
vxE
hyd
-hyS
+cjd
tMO
jYy
sZF
@@ -251169,7 +251169,7 @@ aFR
lVR
rbK
tsY
-wZl
+sgt
tMO
cAA
sZF
@@ -258858,7 +258858,7 @@ pUy
eSJ
pUy
mzG
-dyO
+rZC
sca
xiC
ciS
@@ -259372,7 +259372,7 @@ ouX
ero
itj
fXu
-raG
+xqN
mEJ
oXJ
fbl
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index ae9ec62cbc3..9eda23365c4 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -656,6 +656,26 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
+"agW" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "ce sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"ahz" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -777,29 +797,6 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"ajt" = (
-/obj/structure/rack,
-/obj/item/controller{
- pixel_x = -7
- },
-/obj/item/compact_remote{
- pixel_x = -7
- },
-/obj/item/compact_remote{
- pixel_x = -7
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/airalarm/directional/north,
-/obj/item/integrated_circuit/loaded/speech_relay{
- pixel_x = 7
- },
-/obj/item/integrated_circuit/loaded/hello_world{
- pixel_x = 7
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/ordnance/office)
"ajv" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -824,6 +821,20 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
+"ajE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"ajH" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -848,6 +859,12 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"aky" = (
+/obj/machinery/light/small/directional/north,
+/obj/structure/chair/sofa/middle/maroon,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/turf/open/floor/wood,
+/area/station/maintenance/starboard/fore)
"akC" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -2373,6 +2390,26 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/tcommsat/computer)
+"aFJ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "disposals sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"aGd" = (
/obj/structure/table,
/obj/machinery/camera/directional/west{
@@ -2922,22 +2959,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron,
/area/station/command/gateway)
-"aOS" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "virology sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
-/turf/open/floor/iron/showroomfloor,
-/area/station/medical/medbay/central)
"aPg" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
@@ -2971,29 +2992,6 @@
/obj/machinery/power/shieldwallgen,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"aPx" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/box,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "HoP sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"aPF" = (
/obj/machinery/door/firedoor,
/obj/machinery/light/small/directional/east,
@@ -3440,6 +3438,25 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"aYj" = (
+/obj/structure/cable,
+/obj/structure/chair/sofa/right/maroon{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"aYu" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible,
/turf/closed/wall,
@@ -4994,6 +5011,25 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"bzn" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4;
+ name = "library sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/library,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"bzo" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -6304,49 +6340,6 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"bXb" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/obj/machinery/button/door{
- id = "bridge blast";
- name = "Bridge Lockdown Toggle";
- pixel_x = 6;
- pixel_y = 8;
- req_access = list("command")
- },
-/obj/machinery/button/door{
- id = "bridge-maint";
- name = "Bridge Maintenance Lockdown Toggle";
- pixel_x = 6;
- pixel_y = -2;
- req_access = list("command")
- },
-/obj/machinery/button/door{
- id = "teleshutter";
- name = "Teleporter Shutter Toggle";
- pixel_x = -6;
- pixel_y = 8;
- req_access = list("teleporter")
- },
-/obj/machinery/button/door{
- id = "evashutter";
- name = "E.V.A. Storage Shutter Toggle";
- pixel_x = -6;
- pixel_y = -2;
- req_access = list("command")
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Bridge Control";
- name = "command camera"
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"bXe" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -6374,27 +6367,6 @@
"bXz" = (
/turf/closed/wall,
/area/station/service/kitchen/coldroom)
-"bXA" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
-/turf/open/floor/iron/showroomfloor,
-/area/station/medical/medbay/lobby)
"bXS" = (
/obj/machinery/door/airlock/external{
name = "Prison External Airlock"
@@ -7026,15 +6998,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
-"cga" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/west,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/pdapainter/supply,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/qm)
"cgb" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -7570,23 +7533,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/warden)
-"clQ" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"clR" = (
/obj/machinery/camera/directional/west{
c_tag = "Prison Recreation";
@@ -7634,22 +7580,6 @@
"cml" = (
/turf/closed/wall/rust,
/area/station/service/library)
-"cmG" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"cmQ" = (
/turf/open/floor/cult,
/area/station/service/chapel/office)
@@ -9923,25 +9853,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science/research)
-"cYG" = (
-/obj/structure/cable,
-/obj/structure/chair/sofa/right/maroon{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"cYN" = (
/obj/structure/chair{
dir = 8
@@ -10152,33 +10063,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"dcS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "genetics sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/science/genetics,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/genetics)
"ddb" = (
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Tank - N2";
@@ -10616,6 +10500,23 @@
},
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
+"djr" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"djC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10748,23 +10649,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/security/checkpoint/customs)
-"dkM" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 2;
- name = "robotics sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/science/robotics,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/research)
"dkQ" = (
/obj/machinery/conveyor{
id = "NTMSLoad2";
@@ -10869,6 +10753,22 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/captain)
+"dmF" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"dmU" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/flora/bush/pale/style_random,
@@ -12151,6 +12051,18 @@
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/lesser)
+"dGi" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 2;
+ name = "Theater sorting disposal pipe"
+ },
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/mail_sorting/service/theater,
+/turf/open/floor/plastic,
+/area/station/hallway/secondary/service)
"dGo" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
@@ -13074,6 +12986,23 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
+"dSZ" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"dTd" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -13629,25 +13558,6 @@
/obj/structure/sign/warning/docking,
/turf/closed/wall,
/area/station/maintenance/port/aft)
-"edj" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/siding/purple,
-/obj/machinery/dna_infuser,
-/obj/item/infuser_book,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/genetics)
"edU" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -13789,6 +13699,27 @@
},
/turf/open/floor/iron,
/area/station/command/teleporter)
+"efR" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/stack/sheet/plasteel{
+ amount = 10;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/book/manual/wiki/robotics_cyborgs,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/structure/fireaxecabinet/mechremoval/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"efS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13846,6 +13777,19 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/storage/art)
+"egx" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"egE" = (
/obj/item/radio/intercom/directional/north,
/turf/open/floor/engine,
@@ -16930,25 +16874,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"faZ" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"fbm" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -17497,6 +17422,33 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"fhZ" = (
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "engineering sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/engineering/general,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
+"fiu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "security disposal pipe"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/general,
+/turf/open/floor/iron,
+/area/station/security/office)
"fix" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -18499,6 +18451,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"fuz" = (
+/obj/structure/chair/sofa/right/brown,
+/obj/structure/sign/poster/official/love_ian{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"fuB" = (
/turf/closed/wall/rust,
/area/station/maintenance/starboard/aft)
@@ -18518,18 +18477,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"fuZ" = (
-/obj/structure/cable,
-/obj/structure/bed/dogbed/ian,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/mob/living/simple_animal/pet/dog/corgi/ian{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"fvb" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -19504,22 +19451,49 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
-"fGQ" = (
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
+"fHe" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "virology sorting disposal pipe"
+/obj/machinery/light/directional/north,
+/obj/machinery/button/door{
+ id = "bridge blast";
+ name = "Bridge Lockdown Toggle";
+ pixel_x = 6;
+ pixel_y = 8;
+ req_access = list("command")
},
-/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
-/turf/open/floor/iron/showroomfloor,
-/area/station/medical/virology)
+/obj/machinery/button/door{
+ id = "bridge-maint";
+ name = "Bridge Maintenance Lockdown Toggle";
+ pixel_x = 6;
+ pixel_y = -2;
+ req_access = list("command")
+ },
+/obj/machinery/button/door{
+ id = "teleshutter";
+ name = "Teleporter Shutter Toggle";
+ pixel_x = -6;
+ pixel_y = 8;
+ req_access = list("teleporter")
+ },
+/obj/machinery/button/door{
+ id = "evashutter";
+ name = "E.V.A. Storage Shutter Toggle";
+ pixel_x = -6;
+ pixel_y = -2;
+ req_access = list("command")
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Bridge Control";
+ name = "command camera"
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"fHj" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -19803,20 +19777,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/port)
-"fKl" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"fKs" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -20274,6 +20234,34 @@
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/lesser)
+"fPL" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/storage/wallet,
+/obj/effect/spawner/random/entertainment/coin,
+/obj/effect/spawner/random/entertainment/coin,
+/obj/item/gps{
+ gpstag = "QM0";
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/pen/blue{
+ pixel_x = -5;
+ pixel_y = -10
+ },
+/obj/item/pen/red{
+ pixel_x = 1;
+ pixel_y = -10
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/qm)
"fPN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -20754,13 +20742,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
-"fWK" = (
-/obj/structure/chair/sofa/right/brown,
-/obj/structure/sign/poster/official/love_ian{
- pixel_y = 32
- },
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"fWL" = (
/obj/effect/landmark/start/psychologist,
/turf/open/floor/carpet,
@@ -22330,6 +22311,28 @@
"gtW" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/rd)
+"guj" = (
+/obj/structure/cable,
+/obj/structure/chair/sofa/left/maroon{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/camera/directional/south{
+ c_tag = "Atrium Port";
+ name = "service camera"
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"guu" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -23208,6 +23211,22 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"gGM" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "chapel sorting disposal pipe"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/chapel,
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/fore)
"gGR" = (
/obj/structure/bodycontainer/morgue{
dir = 8
@@ -24148,24 +24167,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron/dark,
/area/station/engineering/storage_shared)
-"gTz" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"gTA" = (
/obj/machinery/door/airlock/hydroponics/glass{
name = "Hydroponics Backroom"
@@ -24578,6 +24579,31 @@
/obj/item/radio/intercom/prison/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"haW" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "custodial sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"hbe" = (
/obj/machinery/door/poddoor/preopen{
id = "xeno4";
@@ -24749,21 +24775,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
-"hdA" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/holopad,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "cmo sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
-/turf/open/floor/iron/showroomfloor,
-/area/station/medical/storage)
"hdY" = (
/obj/machinery/door/airlock/external{
name = "Solar Maintenance"
@@ -26817,27 +26828,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"hFx" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "xenobiology sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/xenobiology)
"hFy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
@@ -27149,22 +27139,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"hJQ" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"hJZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -27290,20 +27264,6 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark,
/area/station/commons/vacant_room/commissary)
-"hLz" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "medical sorting disposal pipe"
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 4
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/general,
-/turf/open/floor/iron/showroomfloor,
-/area/station/medical/storage)
"hLO" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
@@ -27592,19 +27552,6 @@
/obj/item/clothing/mask/surgical,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"hPq" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "dormitories sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
"hPx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/crate,
@@ -28635,22 +28582,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
-"idh" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4;
- name = "chapel sorting disposal pipe"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/effect/mapping_helpers/mail_sorting/service/chapel,
-/turf/open/floor/iron/dark,
-/area/station/hallway/primary/fore)
"idq" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -29032,25 +28963,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/virology)
-"ijy" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "cargo sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"ijz" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -29287,6 +29199,22 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"ilr" = (
+/obj/structure/mop_bucket/janitorialcart,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+ pixel_x = 32
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/fore)
"ils" = (
/obj/structure/chair/office/light{
dir = 8
@@ -29952,24 +29880,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"iuP" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/computer/teleporter{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/east{
- id = "teleshutter";
- name = "Teleporter Shutter Toggle";
- req_access = list("teleporter")
- },
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
"ivh" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -30016,6 +29926,29 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"ivR" = (
+/obj/structure/rack,
+/obj/item/controller{
+ pixel_x = -7
+ },
+/obj/item/compact_remote{
+ pixel_x = -7
+ },
+/obj/item/compact_remote{
+ pixel_x = -7
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/item/integrated_circuit/loaded/speech_relay{
+ pixel_x = 7
+ },
+/obj/item/integrated_circuit/loaded/hello_world{
+ pixel_x = 7
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/ordnance/office)
"ivU" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -30698,41 +30631,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/brig)
-"iFm" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4;
- name = "library sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/library,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"iFv" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"iFE" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -30900,6 +30798,14 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"iHt" = (
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/light_switch/directional/north,
+/obj/machinery/bci_implanter,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/ordnance/office)
"iHC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -31524,6 +31430,25 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"iQs" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "cargo sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"iQK" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/dirt,
@@ -32336,6 +32261,25 @@
"jbt" = (
/turf/closed/wall/mineral/plastitanium,
/area/station/maintenance/starboard)
+"jbE" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/purple,
+/obj/machinery/dna_infuser,
+/obj/item/infuser_book,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/genetics)
"jbP" = (
/obj/structure/flora/rock/pile/style_random,
/obj/effect/turf_decal/stripes/line{
@@ -33498,6 +33442,24 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"jtv" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail{
+ name = "hydroponics sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"jtD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/port_gen/pacman,
@@ -34411,26 +34373,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"jJB" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/landmark/start/hangover,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "disposals sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"jJD" = (
/obj/machinery/power/shieldwallgen/xenobiologyaccess,
/obj/machinery/light/directional/north,
@@ -34516,18 +34458,6 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"jKH" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 2;
- name = "Theater sorting disposal pipe"
- },
-/obj/machinery/duct,
-/obj/effect/mapping_helpers/mail_sorting/service/theater,
-/turf/open/floor/plastic,
-/area/station/hallway/secondary/service)
"jKJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/decoration/glowstick,
@@ -35027,12 +34957,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
-"jSw" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/chair/sofa/middle/maroon,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/turf/open/floor/wood,
-/area/station/maintenance/starboard/fore)
"jSx" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35143,6 +35067,25 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/medical/exam_room)
+"jTF" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "hos sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/office)
"jUa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -35295,6 +35238,24 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/storage_shared)
+"jWN" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"jXd" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -36116,23 +36077,6 @@
/obj/item/toy/figure/hos,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
-"kju" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"kjK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -36656,6 +36600,24 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/port)
+"ksC" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/computer/teleporter{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/east{
+ id = "teleshutter";
+ name = "Teleporter Shutter Toggle";
+ req_access = list("teleporter")
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/teleporter)
"ksM" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall,
@@ -37192,24 +37154,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"kCa" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail{
- name = "hydroponics sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"kCk" = (
/turf/closed/wall/rust,
/area/station/maintenance/disposal/incinerator)
@@ -37569,6 +37513,20 @@
/obj/machinery/meter,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"kHN" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "atmospherics sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"kHQ" = (
/obj/structure/sign/poster/official/wtf_is_co2,
/turf/closed/wall,
@@ -38798,6 +38756,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"kYC" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"kYG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39198,14 +39175,6 @@
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/electrical)
-"lda" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/maintenance/starboard/fore)
"ldc" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 8
@@ -39627,6 +39596,20 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/aft)
+"ljC" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"ljJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -41796,6 +41779,23 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
+"lQf" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/structure/sink/directional/east,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/xenobiology)
"lQj" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -42310,6 +42310,19 @@
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
/area/station/hallway/primary/fore)
+"lYw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "rd sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/siding/purple/corner,
+/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/genetics)
"lYE" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -42455,19 +42468,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"maX" = (
-/obj/machinery/computer/order_console/cook{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Kitchen Coldroom";
- name = "kitchen camera"
- },
-/obj/machinery/light/cold/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"mbc" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -42717,16 +42717,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"meP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "ordnance sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/research)
"meU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -42827,34 +42817,6 @@
dir = 8
},
/area/station/hallway/primary/central/fore)
-"mfM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "security disposal pipe"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/effect/mapping_helpers/mail_sorting/security/general,
-/turf/open/floor/iron,
-/area/station/security/office)
-"mfT" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"mfU" = (
/obj/effect/turf_decal/stripes/end{
dir = 4
@@ -42999,27 +42961,6 @@
/obj/item/stack/cable_coil/cut,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
-"mit" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "qm sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"miK" = (
/obj/effect/decal/cleanable/blood/footprints{
dir = 4;
@@ -43843,6 +43784,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"mvh" = (
+/obj/structure/chair/sofa/corner/maroon,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/maintenance/starboard/fore)
"mvm" = (
/obj/effect/turf_decal/arrows,
/obj/effect/decal/cleanable/blood/old,
@@ -44438,6 +44385,16 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/central)
+"mEv" = (
+/obj/structure/table/wood,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "bar sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/bar,
+/turf/open/floor/wood,
+/area/station/service/bar)
"mEH" = (
/obj/effect/turf_decal/box/corners,
/obj/effect/turf_decal/tile/neutral,
@@ -45079,6 +45036,22 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mOh" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "virology sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
+/turf/open/floor/iron/showroomfloor,
+/area/station/medical/medbay/central)
"mOt" = (
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45900,23 +45873,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/lobby)
-"naG" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"naK" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -47352,20 +47308,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/service/janitor)
-"nxi" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "atmospherics sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"nxj" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -48292,6 +48234,19 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"nLW" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "dormitories sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
"nLZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -48540,25 +48495,6 @@
/obj/effect/spawner/random/structure/tank_holder,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
-"nQk" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"nQo" = (
/obj/machinery/door/firedoor/border_only{
dir = 1
@@ -48778,11 +48714,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"nUi" = (
-/obj/structure/chair/sofa/right/maroon,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/maintenance/starboard/fore)
"nUP" = (
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/start/hangover,
@@ -49504,6 +49435,25 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/hallway)
+"ohk" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/status_display/supply{
+ pixel_y = -32
+ },
+/obj/machinery/camera/directional/south{
+ c_tag = "Mining Dock";
+ name = "cargo camera";
+ network = list("ss13","qm")
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/miningoffice)
"ohq" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
@@ -50597,6 +50547,27 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"oyE" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
+/turf/open/floor/iron/showroomfloor,
+/area/station/medical/medbay/lobby)
"oyP" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -52504,31 +52475,6 @@
/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/turf/open/floor/carpet/royalblue,
/area/station/service/chapel/office)
-"pai" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "custodial sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"pal" = (
/obj/machinery/door/airlock/external{
name = "Atmospherics External Airlock"
@@ -53386,25 +53332,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/execution/transfer)
-"pmk" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/status_display/supply{
- pixel_y = -32
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Mining Dock";
- name = "cargo camera";
- network = list("ss13","qm")
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/miningoffice)
"pmq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54837,34 +54764,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"pIi" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/storage/wallet,
-/obj/effect/spawner/random/entertainment/coin,
-/obj/effect/spawner/random/entertainment/coin,
-/obj/item/gps{
- gpstag = "QM0";
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/pen/blue{
- pixel_x = -5;
- pixel_y = -10
- },
-/obj/item/pen/red{
- pixel_x = 1;
- pixel_y = -10
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/qm)
"pIl" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -55200,6 +55099,16 @@
},
/turf/open/floor/iron/dark,
/area/station/construction/mining/aux_base)
+"pMd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "ordnance sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/research)
"pMj" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -57218,6 +57127,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/engine,
/area/station/engineering/gravity_generator)
+"qqV" = (
+/obj/structure/mop_bucket/janitorialcart,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/janitor)
"qqZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57325,6 +57246,23 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"qsz" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"qsA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral,
@@ -57705,6 +57643,23 @@
/obj/machinery/holopad,
/turf/open/floor/iron/showroomfloor,
/area/station/science/robotics/lab)
+"qyN" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 2;
+ name = "robotics sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/robotics,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/research)
"qyQ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -58266,6 +58221,15 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
+"qHU" = (
+/obj/structure/cable,
+/obj/structure/chair/sofa/left/brown,
+/obj/item/toy/plush/moth{
+ name = "Big Moffer"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"qHV" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -58659,23 +58623,6 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"qOB" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"qOG" = (
/obj/structure/cable,
/obj/structure/table,
@@ -59273,20 +59220,6 @@
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/lesser)
-"qWC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"qWJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59400,6 +59333,20 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"qYg" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"qYr" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -59443,6 +59390,19 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/station/engineering/storage/tech)
+"qYX" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "detective sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"qZf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59915,6 +59875,29 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"rgg" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/box,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "HoP sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"rgv" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/delivery,
@@ -60908,22 +60891,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"rtN" = (
-/obj/structure/mop_bucket/janitorialcart,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/lusty_xenomorph{
- pixel_x = 32
- },
-/turf/open/floor/iron/dark,
-/area/station/maintenance/fore)
"rtT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -61324,6 +61291,23 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"ryY" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"ryZ" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -61803,20 +61787,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"rFS" = (
-/obj/structure/chair/sofa/left/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"rGK" = (
/obj/structure/railing{
dir = 1
@@ -61939,18 +61909,6 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
-"rIy" = (
-/obj/structure/mop_bucket/janitorialcart,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/service/janitor)
"rIY" = (
/obj/structure/table,
/obj/item/radio/intercom{
@@ -63161,27 +63119,6 @@
"saW" = (
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
-"sbd" = (
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_x = -32
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
-"sbf" = (
-/obj/structure/table/wood,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "bar sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/service/bar,
-/turf/open/floor/wood,
-/area/station/service/bar)
"sbh" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63448,6 +63385,11 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/hallway)
+"sei" = (
+/obj/structure/chair/sofa/right/maroon,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/maintenance/starboard/fore)
"seo" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -64354,6 +64296,25 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"srt" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"srx" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -64504,24 +64465,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"str" = (
-/obj/structure/chair/sofa/right/maroon{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"stu" = (
/obj/structure/sign/departments/security,
/turf/closed/wall,
@@ -64647,12 +64590,6 @@
/obj/structure/cable,
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/captain)
-"swW" = (
-/obj/structure/chair/sofa/corner/maroon,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/maintenance/starboard/fore)
"swY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65168,19 +65105,22 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
+"sFm" = (
+/obj/structure/cable,
+/obj/structure/bed/dogbed/ian,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/mob/living/basic/pet/dog/corgi/ian{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"sFr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/showroomfloor,
/area/station/science/ordnance)
-"sFu" = (
-/obj/structure/cable,
-/obj/structure/chair/sofa/left/brown,
-/obj/item/toy/plush/moth{
- name = "Big Moffer"
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"sFv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65473,14 +65413,6 @@
},
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
-"sIH" = (
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/light_switch/directional/north,
-/obj/machinery/bci_implanter,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/ordnance/office)
"sIO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66738,6 +66670,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"sZv" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"sZw" = (
/obj/machinery/camera/directional/east{
c_tag = "Satellite External Port";
@@ -67142,19 +67090,6 @@
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall/rust,
/area/station/engineering/supermatter/room)
-"tfh" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 8;
- name = "detective sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"tfi" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/sand/plating,
@@ -67505,6 +67440,27 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"tkq" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "qm sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"tkO" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -68956,6 +68912,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
+"tDP" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/west,
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/pdapainter/supply,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/qm)
"tDT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -70208,6 +70173,24 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/restrooms)
+"tYj" = (
+/obj/structure/chair/sofa/right/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"tYx" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Dock"
@@ -72087,22 +72070,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"uAh" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "science sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/science/research,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/lab)
"uAn" = (
/obj/effect/turf_decal/siding/thinplating/dark,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -72932,19 +72899,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/brig)
-"uNi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 2;
- name = "rd sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/siding/purple/corner,
-/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/genetics)
"uNv" = (
/obj/machinery/power/turbine/turbine_outlet,
/turf/open/floor/engine,
@@ -73487,6 +73441,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/misc/asteroid,
/area/space/nearstation)
+"uWR" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "kitchen sorting disposal pipe"
+ },
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
+/turf/open/floor/iron/showroomfloor,
+/area/station/service/bar/atrium)
"uWS" = (
/obj/structure/rack,
/obj/item/stack/medical/gauze,
@@ -74210,6 +74180,29 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"vgW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Central Hallway Teleporter Access";
+ name = "central camera"
+ },
+/obj/machinery/button/door/directional/north{
+ id = "teleshutter";
+ name = "Teleporter Shutter Toggle";
+ req_access = list("teleporter")
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"vha" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -74420,6 +74413,19 @@
"vkE" = (
/turf/closed/wall/rust,
/area/station/security/checkpoint/medical)
+"vkF" = (
+/obj/machinery/computer/order_console/cook{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/camera/directional/east{
+ c_tag = "Kitchen Coldroom";
+ name = "kitchen camera"
+ },
+/obj/machinery/light/cold/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"vkJ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/power/terminal{
@@ -74706,6 +74712,27 @@
},
/turf/open/floor/wood,
/area/station/service/theater)
+"voY" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4;
+ name = "xenobiology sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/xenobiology)
"vpd" = (
/obj/structure/table,
/obj/item/clipboard{
@@ -75454,6 +75481,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
+"vyo" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "science sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/research,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/lab)
"vys" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -75895,18 +75938,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/commons/storage/primary)
-"vEl" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "engineering sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/engineering/general,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"vEt" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -76725,6 +76756,23 @@
dir = 8
},
/area/station/hallway/primary/port)
+"vOj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_y = -24
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/turf/open/floor/engine,
+/area/station/maintenance/disposal/incinerator)
"vOl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -77128,27 +77176,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"vTu" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/item/stack/sheet/plasteel{
- amount = 10;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/book/manual/wiki/robotics_cyborgs,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/structure/fireaxecabinet/mechremoval/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
"vTx" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/yellow,
@@ -77517,6 +77544,22 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"vYb" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar/atrium)
"vYm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -77548,22 +77591,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"vYD" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "kitchen sorting disposal pipe"
- },
-/obj/machinery/duct,
-/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
-/turf/open/floor/iron/showroomfloor,
-/area/station/service/bar/atrium)
"vYI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -78197,28 +78224,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/service/bar/atrium)
-"wiz" = (
-/obj/structure/cable,
-/obj/structure/chair/sofa/left/maroon{
- dir = 8
- },
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/camera/directional/south{
- c_tag = "Atrium Port";
- name = "service camera"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar/atrium)
"wiM" = (
/obj/structure/cable,
/obj/structure/table,
@@ -78412,6 +78417,22 @@
/obj/structure/bookcase/random/fiction,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/fore)
+"wlp" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "virology sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
+/turf/open/floor/iron/showroomfloor,
+/area/station/medical/virology)
"wlz" = (
/obj/structure/railing{
dir = 8
@@ -78792,6 +78813,20 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/brig)
+"wpk" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ name = "medical sorting disposal pipe"
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/medbay/general,
+/turf/open/floor/iron/showroomfloor,
+/area/station/medical/storage)
"wpn" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -79900,29 +79935,6 @@
},
/turf/open/floor/engine,
/area/station/ai_monitored/command/nuke_storage)
-"wFU" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/box,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "lawyer sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/service/law_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"wGd" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -80150,25 +80162,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"wHT" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "hos sorting disposal pipe"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
-/turf/open/floor/iron/showroomfloor,
-/area/station/security/office)
"wHW" = (
/obj/structure/closet/secure_closet/security/engine,
/obj/effect/turf_decal/delivery,
@@ -80509,29 +80502,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"wNs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Central Hallway Teleporter Access";
- name = "central camera"
- },
-/obj/machinery/button/door/directional/north{
- id = "teleshutter";
- name = "Teleporter Shutter Toggle";
- req_access = list("teleporter")
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"wNQ" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -82241,6 +82211,33 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"xnR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 2;
+ name = "genetics sorting disposal pipe"
+ },
+/obj/effect/mapping_helpers/mail_sorting/science/genetics,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/genetics)
"xnU" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -82406,6 +82403,21 @@
"xqw" = (
/turf/open/floor/bronze,
/area/station/maintenance/department/chapel)
+"xqy" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "cmo sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
+/turf/open/floor/iron/showroomfloor,
+/area/station/medical/storage)
"xqE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -83060,26 +83072,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
-"xAw" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- name = "ce sorting disposal pipe"
- },
-/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"xAI" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 5
@@ -84243,6 +84235,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
/area/station/science/genetics)
+"xSj" = (
+/obj/structure/chair/sofa/left/maroon{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/maintenance/starboard/fore)
"xSn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -84634,23 +84634,17 @@
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall/rust,
/area/station/maintenance/starboard)
-"xWT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+"xXh" = (
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
},
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_y = -24
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = -32
},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
+/area/station/science/ordnance/burnchamber)
"xXo" = (
/obj/structure/sign/departments/xenobio,
/turf/closed/wall/r_wall,
@@ -85193,6 +85187,29 @@
/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/fore)
+"yeJ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/box,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "lawyer sorting disposal pipe"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/service/law_office,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"yeK" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral{
@@ -85602,23 +85619,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
-"ykd" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/structure/sink/directional/east,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/xenobiology)
"ykv" = (
/obj/structure/railing/corner{
dir = 8
@@ -103324,7 +103324,7 @@ bZY
bzp
dtA
sbB
-qWC
+ajE
qOT
lcF
eWP
@@ -103594,7 +103594,7 @@ iGI
thG
taW
ktA
-hdA
+xqy
kSx
ruU
jop
@@ -103851,7 +103851,7 @@ mfs
vpD
eDu
wcC
-hLz
+wpk
lRq
fzG
jop
@@ -104130,7 +104130,7 @@ eKU
jiR
mle
hQg
-hPq
+nLW
dny
joS
pqD
@@ -104926,7 +104926,7 @@ hgf
kiZ
vBI
nqh
-mfM
+fiu
cjN
oKW
nvA
@@ -105393,7 +105393,7 @@ uCa
hPV
fph
bsR
-aOS
+mOh
hDX
lTu
rSi
@@ -105635,7 +105635,7 @@ tlJ
pVz
mMP
xBI
-fWK
+fuz
fWL
kEC
wtP
@@ -105697,7 +105697,7 @@ vtf
veu
mun
aqq
-wHT
+jTF
thy
oHm
kAt
@@ -105892,7 +105892,7 @@ qLO
qEs
yiN
xBI
-sFu
+qHU
jIg
pdI
cUk
@@ -106947,7 +106947,7 @@ mnG
uEX
nCU
llY
-fGQ
+wlp
qZS
egU
fpx
@@ -107446,7 +107446,7 @@ pbk
qpP
wzW
pFq
-bXA
+oyE
naC
xKr
xKr
@@ -108980,7 +108980,7 @@ mjc
hsJ
cXZ
krg
-idh
+gGM
sby
oAN
gQd
@@ -109268,7 +109268,7 @@ qNh
gFR
uqc
jgr
-wFU
+yeJ
jWw
uAA
dLk
@@ -110530,7 +110530,7 @@ dkA
ovv
ovv
nIx
-iFm
+bzn
ocO
eAl
rYf
@@ -110834,7 +110834,7 @@ vlJ
srW
hkq
nOI
-tfh
+qYX
mCm
caS
ruo
@@ -112313,7 +112313,7 @@ aeu
aeu
efG
hVZ
-rtN
+ilr
dpe
nNT
pms
@@ -112405,7 +112405,7 @@ vCV
mLN
ekp
dtb
-xWT
+vOj
yma
yma
kPK
@@ -113368,7 +113368,7 @@ mma
oSD
lvy
fEE
-jKH
+dGi
eiz
cIC
dkH
@@ -113879,7 +113879,7 @@ dBw
jlw
lHE
ele
-sbf
+mEv
gbO
vDD
xLk
@@ -114155,7 +114155,7 @@ rKj
fYh
fYh
cEr
-fuZ
+sFm
ept
cfC
dPn
@@ -114648,12 +114648,12 @@ dYy
fzL
yej
qTC
-naG
-hJQ
+ryY
+dmF
gpS
bMN
-nQk
-cmG
+kYC
+sZv
mQN
uWQ
czT
@@ -115162,12 +115162,12 @@ oHD
fzL
vSq
qTC
-fKl
-clQ
+qYg
+djr
piB
xSU
-kju
-wiz
+qsz
+guj
mZW
kLy
dyK
@@ -115448,7 +115448,7 @@ pik
dfi
vfb
fgJ
-aPx
+rgg
dpx
hAJ
kax
@@ -115935,7 +115935,7 @@ xoT
wiw
ikR
ikR
-vYD
+uWR
bvN
fiY
kzG
@@ -116190,16 +116190,16 @@ jzt
fzL
hjJ
qTC
-iFv
-gTz
+vYb
+tYj
jDy
tDW
-faZ
-cYG
+srt
+aYj
mZW
sIf
dyK
-bXb
+fHe
jRe
pgQ
fnu
@@ -116704,12 +116704,12 @@ tEE
fzL
nTG
qTC
-mfT
-qOB
+egx
+dSZ
vYI
lYE
-str
-rFS
+jWN
+ljC
mQN
jJh
czT
@@ -117501,7 +117501,7 @@ pOd
pjm
kOJ
lfU
-iuP
+ksC
nnV
mmF
hyl
@@ -117760,7 +117760,7 @@ tqz
jlh
jlh
bBS
-wNs
+vgW
kVv
nrv
sPP
@@ -118481,7 +118481,7 @@ cIX
cIX
cIX
fvU
-nUi
+sei
iVF
elc
hIs
@@ -118738,7 +118738,7 @@ cIX
cIX
cIX
lRk
-jSw
+aky
kNJ
mOa
qbc
@@ -118798,7 +118798,7 @@ bax
bax
mnO
nJj
-nxi
+kHN
kBs
mwn
xeq
@@ -118995,8 +118995,8 @@ cIX
cIX
cIX
fvU
-swW
-lda
+mvh
+xSj
pvH
lRk
fvU
@@ -119055,7 +119055,7 @@ wRE
gng
xsJ
xLH
-xAw
+agW
bSX
ddI
jMo
@@ -119280,7 +119280,7 @@ bXz
bXz
wIL
ffv
-maX
+vkF
dyX
xPk
laE
@@ -119312,7 +119312,7 @@ cWS
nFu
qPz
cLq
-vEl
+fhZ
dwL
mxx
qMC
@@ -120803,7 +120803,7 @@ lRk
enP
lZi
xSO
-vTu
+efR
dRR
tmf
xvh
@@ -122103,10 +122103,10 @@ vPd
rOq
nMj
anN
-kCa
+jtv
asu
anN
-mit
+tkq
tXz
anN
twG
@@ -122114,7 +122114,7 @@ qXa
cpZ
tXz
anN
-ijy
+iQs
wwJ
aot
xnK
@@ -122642,7 +122642,7 @@ gXc
uIx
ihU
xHc
-pai
+haW
kua
fuq
hnA
@@ -122856,7 +122856,7 @@ hZP
lZi
tFq
kwV
-edj
+jbE
wsy
xJB
sJU
@@ -122899,7 +122899,7 @@ rEE
upa
xNe
ghO
-jJB
+aFJ
tuO
vzy
vyE
@@ -123103,13 +123103,13 @@ cAz
jFv
vgJ
xta
-ykd
+lQf
shS
epI
rtK
lev
kKw
-hFx
+voY
frO
oMA
spG
@@ -123368,23 +123368,23 @@ uYb
rHm
uXI
pnI
-dcS
+xnR
aAy
-uNi
+lYw
ieV
hma
hZr
uYP
tNe
-dkM
+qyN
eog
iUm
eog
eog
riC
-meP
+pMd
rhK
-uAh
+vyo
iQd
mfY
nFb
@@ -123416,7 +123416,7 @@ rpN
rqb
drl
nxc
-rIy
+qqV
kDC
sLP
qny
@@ -124421,8 +124421,8 @@ lDu
lDu
dJS
vOX
-cga
-pIi
+tDP
+fPL
aru
wNb
atu
@@ -125945,7 +125945,7 @@ iBY
wCY
gyv
oLH
-sIH
+iHt
xqf
jiO
uLW
@@ -126202,7 +126202,7 @@ rZV
fRp
rVY
lDu
-ajt
+ivR
wdu
mEW
cAl
@@ -127509,7 +127509,7 @@ pNY
bRx
rcp
mjW
-pmk
+ohk
qAR
aaa
aaa
@@ -127748,7 +127748,7 @@ nFN
fLH
apu
pii
-sbd
+xXh
lkB
lkB
lkB
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 2f3223935a5..09728a98f02 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -83,13 +83,6 @@
},
/turf/open/floor/carpet,
/area/station/commons/dorms)
-"abI" = (
-/obj/structure/chair/stool/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"abR" = (
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -2938,21 +2931,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"aZW" = (
-/obj/structure/closet/crate/necropolis{
- desc = "Presumably placed here by top men.";
- name = "\improper Ark of the Covenant"
- },
-/obj/item/toy/clockwork_watch{
- desc = "An ancient piece of machinery, made from an unknown metal by an unknown maker.";
- name = "\improper Ancient Relic"
- },
-/mob/living/simple_animal/pet/dog/corgi{
- desc = "Make sure you give him plenty of bellyrubs, or he'll melt your skin off.";
- name = "\improper Keeper of the Ark"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"bau" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -3488,6 +3466,17 @@
"bjQ" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"bjX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"bkl" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -4672,6 +4661,28 @@
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"bFA" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/iron{
+ dir = 1
+ },
+/area/station/engineering/main)
+"bFG" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/machinery/duct,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"bFN" = (
/obj/machinery/chem_dispenser{
layer = 2.7
@@ -5878,17 +5889,6 @@
/obj/item/defibrillator/loaded,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
-"chr" = (
-/obj/machinery/computer/scan_consolenew{
- dir = 4
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"chH" = (
/obj/structure/chair/stool/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6403,6 +6403,10 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/security/prison)
+"cse" = (
+/obj/machinery/duct,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"cst" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering Foyer"
@@ -6887,6 +6891,10 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
+"czS" = (
+/obj/structure/chair/sofa/left/brown,
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"czT" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/broken_floor,
@@ -9919,6 +9927,13 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
+"dIM" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dIO" = (
/turf/closed/wall,
/area/station/commons/toilet/restrooms)
@@ -10452,13 +10467,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"dRA" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"dRE" = (
/obj/structure/chair/office{
dir = 1
@@ -10631,6 +10639,27 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"dUW" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/door/airlock/engineering{
+ name = "Engine Room"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/iron{
+ dir = 1
+ },
+/area/station/engineering/main)
"dVb" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -11274,11 +11303,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"efW" = (
-/obj/effect/spawner/random/vending/snackvend,
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/hallway/primary/central)
"efY" = (
/obj/structure/chair/office{
dir = 1
@@ -12694,10 +12718,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"eFU" = (
-/obj/structure/chair/sofa/left/brown,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"eGd" = (
/obj/machinery/door/window{
dir = 1;
@@ -12709,6 +12729,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"eGl" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"eGm" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/camera/directional/west{
@@ -15055,12 +15084,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"fEJ" = (
-/obj/machinery/status_display/evac/directional/north,
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/ian,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"fEK" = (
/turf/closed/wall,
/area/station/medical/medbay/central)
@@ -15280,20 +15303,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"fHy" = (
-/obj/machinery/door/poddoor/shutters{
- id = "teleshutter";
- name = "Teleporter Access Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/button/door/directional/east{
- id = "teleshutter";
- name = "Teleporter Shutter Control";
- pixel_y = 5;
- req_access = list("teleporter")
- },
-/turf/open/floor/iron,
-/area/station/command/teleporter)
"fHC" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -16575,6 +16584,14 @@
"ggj" = (
/turf/closed/wall,
/area/station/security/evidence)
+"ggG" = (
+/obj/machinery/light_switch/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/mob/living/basic/pet/dog/corgi/puppy/slime,
+/turf/open/floor/grass,
+/area/station/science/research)
"ggH" = (
/obj/effect/spawner/random/structure/chair_maintenance,
/turf/open/floor/iron/checker,
@@ -17024,6 +17041,12 @@
},
/turf/open/floor/iron/kitchen_coldroom,
/area/station/medical/coldroom)
+"gom" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Medbay Maintenance"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"gon" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/airalarm/directional/west,
@@ -17143,6 +17166,20 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
+"gqD" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "teleshutter";
+ name = "Teleporter Access Shutter"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/button/door/directional/east{
+ id = "teleshutter";
+ name = "Teleporter Shutter Control";
+ pixel_y = 5;
+ req_access = list("teleporter")
+ },
+/turf/open/floor/iron,
+/area/station/command/teleporter)
"gqI" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -17310,6 +17347,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"guc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"gui" = (
/obj/structure/bodycontainer/morgue{
dir = 1
@@ -17819,16 +17862,6 @@
/obj/structure/cable/multilayer/connected,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/satellite)
-"gEy" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/mob/living/simple_animal/pet/dog/corgi/puppy/void{
- dir = 4
- },
-/turf/open/floor/grass,
-/area/station/science/research)
"gEF" = (
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
@@ -19076,6 +19109,17 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/engineering/main)
+"gZJ" = (
+/obj/machinery/computer/scan_consolenew{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"gZQ" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -19727,13 +19771,6 @@
/obj/machinery/vending/wardrobe/medi_wardrobe,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
-"hmf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"hml" = (
/obj/effect/turf_decal/box/red,
/obj/effect/turf_decal/arrows/red{
@@ -20777,12 +20814,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"hGA" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Medbay Maintenance"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"hGF" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -21227,13 +21258,6 @@
},
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
-"hPu" = (
-/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
- dir = 5
- },
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"hPM" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -22697,14 +22721,6 @@
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
-"ioy" = (
-/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
- dir = 1
- },
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"ioz" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -23601,27 +23617,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"iCi" = (
-/obj/effect/turf_decal/siding/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/dna_infuser,
-/obj/item/infuser_book,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
-"iCj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_x = 40;
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
"iCz" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
@@ -25277,21 +25272,6 @@
},
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
-"jcJ" = (
-/obj/machinery/door/poddoor/preopen{
- id = "Engineering";
- name = "Engineering Security Doors"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron/dark,
-/area/station/engineering/break_room)
"jcR" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25976,15 +25956,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
-"joC" = (
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/siding/purple{
- dir = 5
- },
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"jpr" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/command_all,
@@ -29610,26 +29581,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"kBu" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/purple/corner{
- dir = 1
- },
-/obj/item/storage/box/bodybags{
- pixel_x = -4;
- pixel_y = 9
- },
-/obj/item/storage/box/disks{
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/clothing/gloves/color/latex{
- pixel_x = 4;
- pixel_y = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"kBQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/electrolyzer,
@@ -30576,6 +30527,12 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/commons/locker)
+"kTG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"kTK" = (
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
@@ -31336,27 +31293,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"liz" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/door/airlock/engineering{
- name = "Engine Room"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron{
- dir = 1
- },
-/area/station/engineering/main)
"liC" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -31432,41 +31368,6 @@
/obj/structure/sign/barsign,
/turf/closed/wall,
/area/station/commons/lounge)
-"lkL" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/item/radio/headset/headset_medsci{
- pixel_x = -7;
- pixel_y = 4
- },
-/obj/item/storage/box/monkeycubes{
- pixel_x = 6;
- pixel_y = 9
- },
-/obj/item/storage/box/gloves{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/machinery/button/door/directional/east{
- id = "rdgene2";
- name = "Secondary Genetics Shutters Control";
- pixel_y = -6;
- req_access = list("science")
- },
-/obj/machinery/button/door/directional/east{
- id = "rdgene";
- name = "Primary Genetics Shutters Control";
- pixel_y = 6;
- req_access = list("science")
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/storage/box/monkeycubes{
- pixel_x = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"lkW" = (
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -32220,12 +32121,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/command/gateway)
-"lwm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"lwn" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/right/directional/south{
@@ -32582,18 +32477,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
-"lFo" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/computer/order_console/cook{
- dir = 8
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/greater)
"lFq" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall,
@@ -32818,6 +32701,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
+"lKY" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/bed/dogbed/ian,
+/mob/living/basic/pet/dog/corgi/ian,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"lKZ" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -32965,6 +32854,16 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"lMP" = (
+/obj/structure/chair/stool/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 8
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"lMW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32995,6 +32894,17 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"lNc" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/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,
+/area/station/engineering/main)
"lNE" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/event_spawn,
@@ -35133,13 +35043,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"mAy" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"mAJ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35160,6 +35063,13 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"mAW" = (
+/obj/structure/chair/stool/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"mBb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -35339,16 +35249,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/commons/locker)
-"mDN" = (
-/obj/structure/chair/stool/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction/yjunction{
- dir = 8
- },
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"mDX" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -38183,14 +38083,6 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
-"nAG" = (
-/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"nAN" = (
/obj/machinery/door/airlock/grunge{
name = "Cell 4"
@@ -38586,23 +38478,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"nJA" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_x = -24
- },
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = 24;
- pixel_y = -6
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = 24;
- pixel_y = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"nJG" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -38926,6 +38801,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/research)
+"nOL" = (
+/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/duct,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"nOU" = (
/obj/structure/table/wood,
/obj/item/radio/intercom{
@@ -39125,6 +39008,15 @@
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"nST" = (
+/obj/effect/turf_decal/siding/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/dna_infuser,
+/obj/item/infuser_book,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"nTd" = (
/obj/structure/rack,
/obj/effect/spawner/random/food_or_drink/seed,
@@ -39839,6 +39731,13 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"ofq" = (
+/obj/machinery/plumbing/synthesizer{
+ dir = 8;
+ reagent_id = /datum/reagent/water
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"ofQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -43452,6 +43351,11 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
+"pvn" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/central)
"pvL" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -43891,6 +43795,14 @@
},
/turf/open/floor/iron/dark,
/area/station/construction/storage_wing)
+"pEg" = (
+/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/duct,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"pEk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -43964,6 +43876,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"pFf" = (
+/obj/structure/closet/crate/necropolis{
+ desc = "Presumably placed here by top men.";
+ name = "\improper Ark of the Covenant"
+ },
+/obj/item/toy/clockwork_watch{
+ desc = "An ancient piece of machinery, made from an unknown metal by an unknown maker.";
+ name = "\improper Ancient Relic"
+ },
+/mob/living/basic/pet/dog/corgi{
+ desc = "Make sure you give him plenty of bellyrubs, or he'll melt your skin off.";
+ name = "\improper Keeper of the Ark"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"pFg" = (
/obj/machinery/camera/directional/east{
c_tag = "Medbay Surgery Aft";
@@ -44007,6 +43934,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"pGc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"pGn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -44175,14 +44115,6 @@
/obj/machinery/research/anomaly_refinery,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"pIP" = (
-/obj/machinery/light_switch/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/mob/living/simple_animal/pet/dog/corgi/puppy/slime,
-/turf/open/floor/grass,
-/area/station/science/research)
"pJf" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -46627,6 +46559,13 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"qBW" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Surgery C Maintenance"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/aft/greater)
"qCa" = (
/obj/structure/rack,
/obj/item/storage/box/shipping,
@@ -46654,19 +46593,6 @@
/obj/machinery/telecomms/processor/preset_two,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
-"qCy" = (
-/obj/structure/cable,
-/obj/structure/bed/dogbed/mcgriff,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/firealarm/directional/west{
- pixel_y = 26
- },
-/mob/living/simple_animal/pet/dog/pug/mcgriff,
-/obj/effect/turf_decal/trimline/dark_red/filled/line{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/security/warden)
"qCC" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -47525,6 +47451,16 @@
/obj/effect/spawner/random/trash/janitor_supplies,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"qRB" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/mob/living/basic/pet/dog/corgi/puppy/void{
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/station/science/research)
"qRD" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -48389,6 +48325,19 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"rim" = (
+/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"riz" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -49651,6 +49600,41 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"rEG" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/item/radio/headset/headset_medsci{
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/obj/item/storage/box/monkeycubes{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/item/storage/box/gloves{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/machinery/button/door/directional/east{
+ id = "rdgene2";
+ name = "Secondary Genetics Shutters Control";
+ pixel_y = -6;
+ req_access = list("science")
+ },
+/obj/machinery/button/door/directional/east{
+ id = "rdgene";
+ name = "Primary Genetics Shutters Control";
+ pixel_y = 6;
+ req_access = list("science")
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/storage/box/monkeycubes{
+ pixel_x = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"rEO" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -49794,6 +49778,18 @@
/obj/item/computer_disk/medical,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"rHm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_x = 40;
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/turf/open/floor/engine,
+/area/station/maintenance/disposal/incinerator)
"rHn" = (
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter)
@@ -49899,28 +49895,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"rIP" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
-"rIZ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 1
- },
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"rJk" = (
/obj/machinery/door/airlock{
name = "Theater Backstage"
@@ -50577,6 +50551,13 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"rTs" = (
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"rTw" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -50601,6 +50582,19 @@
/obj/effect/spawner/random/decoration/showcase,
/turf/open/floor/carpet,
/area/station/command/corporate_showroom)
+"rTA" = (
+/obj/structure/cable,
+/obj/structure/bed/dogbed/mcgriff,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = 26
+ },
+/mob/living/basic/pet/dog/pug/mcgriff,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/security/warden)
"rTL" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -51284,15 +51278,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"see" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"sej" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -51548,6 +51533,13 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
+"sje" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"sjx" = (
/obj/structure/cable,
/obj/item/kirbyplants/random,
@@ -52196,13 +52188,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/explab)
-"svo" = (
-/obj/machinery/plumbing/synthesizer{
- dir = 8;
- reagent_id = /datum/reagent/water
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"svQ" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/unres{
@@ -52220,6 +52205,18 @@
"svS" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/aft/lesser)
+"svT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/computer/order_console/cook{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/greater)
"svW" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -53762,12 +53759,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"sWs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"sWv" = (
/obj/machinery/button/door/directional/north{
id = "chem_lockdown";
@@ -58074,19 +58065,6 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"uwe" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron{
- dir = 1
- },
-/area/station/engineering/main)
"uwg" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
@@ -58607,6 +58585,26 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"uEY" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding/purple/corner{
+ dir = 1
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = -4;
+ pixel_y = 9
+ },
+/obj/item/storage/box/disks{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/clothing/gloves/color/latex{
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"uFf" = (
/obj/machinery/holopad,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -58861,6 +58859,21 @@
},
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
+"uIj" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Engineering";
+ name = "Engineering Security Doors"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/iron/dark,
+/area/station/engineering/break_room)
"uIs" = (
/turf/closed/wall,
/area/station/service/kitchen)
@@ -59144,16 +59157,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"uNq" = (
-/obj/structure/sign/poster/official/get_your_legs{
- pixel_y = 32
- },
-/obj/structure/chair/sofa/right/brown,
-/obj/item/toy/plush/moth{
- name = "Mender Moff"
- },
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"uNs" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -60216,6 +60219,23 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"vji" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = -24
+ },
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = 24;
+ pixel_y = -6
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = 24;
+ pixel_y = 8
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"vjk" = (
/obj/effect/turf_decal/siding/purple{
dir = 10
@@ -62100,13 +62120,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/security/office)
-"vPY" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Surgery C Maintenance"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/aft/greater)
"vQb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -62578,6 +62591,15 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"vXp" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/purple{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"vXt" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -63167,17 +63189,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"whC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"whN" = (
/obj/docking_port/stationary{
dheight = 4;
@@ -63874,6 +63885,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
+"wvw" = (
+/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
+ dir = 5
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"wvP" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/iv_drip,
@@ -64633,10 +64651,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"wLw" = (
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"wLx" = (
/obj/structure/closet/wardrobe/mixed,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -66437,6 +66451,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
+"xrG" = (
+/obj/structure/sign/poster/official/get_your_legs{
+ pixel_y = 32
+ },
+/obj/structure/chair/sofa/right/brown,
+/obj/item/toy/plush/moth{
+ name = "Mender Moff"
+ },
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"xrN" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -66796,17 +66820,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/brig)
-"xyw" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/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,
-/area/station/engineering/main)
"xyz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68452,19 +68465,6 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"yci" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"ycj" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms Server Room"
@@ -84284,7 +84284,7 @@ ybm
jUb
wgl
jUb
-aZW
+pFf
jUb
qkm
vmY
@@ -87046,7 +87046,7 @@ gQv
jXu
jXu
jXu
-mAy
+dIM
cLj
kRe
aFd
@@ -87640,7 +87640,7 @@ tzE
ucc
tSw
tSw
-vPY
+qBW
tSw
tSw
tSw
@@ -88405,7 +88405,7 @@ sWO
oxW
dqN
vlH
-hGA
+gom
miy
tFr
nMf
@@ -90471,7 +90471,7 @@ jsO
cpR
lxC
uYp
-uNq
+xrG
sfA
eQO
xjI
@@ -90728,7 +90728,7 @@ oAj
qOV
qQu
uYp
-eFU
+czS
sfA
dvn
qkJ
@@ -90949,7 +90949,7 @@ sVY
sVY
sVY
sVY
-efW
+pvn
xxk
ahr
bMY
@@ -93758,7 +93758,7 @@ tUH
vPW
lDo
pJR
-fEJ
+lKY
hip
fJp
wBu
@@ -94289,7 +94289,7 @@ vnp
vnp
vnp
exN
-fHy
+gqD
gqX
cfb
laK
@@ -95782,7 +95782,7 @@ aeq
dfE
fYJ
ycM
-qCy
+rTA
dsk
ewC
iAN
@@ -97151,7 +97151,7 @@ cId
rQl
oIg
wBq
-chr
+gZJ
vKW
jNX
jxW
@@ -97407,7 +97407,7 @@ kQe
cDM
poS
byf
-kBu
+uEY
oir
wal
mXt
@@ -97661,7 +97661,7 @@ gle
mOx
syC
gqm
-iCi
+nST
lOr
sNS
dbo
@@ -98175,10 +98175,10 @@ bBo
gwf
gfZ
gqm
-joC
+vXp
cDA
jrb
-lkL
+rEG
bkm
cDA
edH
@@ -100757,7 +100757,7 @@ fhi
fhi
fhi
twy
-nJA
+vji
nZL
bEv
cgP
@@ -106132,7 +106132,7 @@ qXb
mBK
tUn
wXF
-gEy
+qRB
gcV
nNe
nbS
@@ -106903,7 +106903,7 @@ jkV
pRu
pFN
wXF
-pIP
+ggG
wZg
ojo
kWB
@@ -107908,7 +107908,7 @@ ggM
gIS
xNG
gYV
-lFo
+svT
qpn
tHk
unL
@@ -108179,7 +108179,7 @@ lWq
lWq
lWq
qIq
-iCj
+rHm
rDm
smg
crg
@@ -109939,13 +109939,13 @@ vjB
haa
hRq
xba
-xyw
+lNc
iMS
-uwe
-liz
-jcJ
-yci
-whC
+bFA
+dUW
+uIj
+pGc
+bjX
fxa
kCC
qRh
@@ -110202,7 +110202,7 @@ dOQ
cnK
qGK
fzd
-mDN
+lMP
mBQ
sCh
lma
@@ -110459,7 +110459,7 @@ vIY
vIY
gQQ
lfc
-abI
+mAW
dpn
dQE
heL
@@ -110716,7 +110716,7 @@ gaw
qsv
rQL
lUz
-sWs
+kTG
ruu
uTH
dFH
@@ -110973,7 +110973,7 @@ xXv
ilT
uwy
vML
-hmf
+sje
glz
khu
khu
@@ -111230,7 +111230,7 @@ uUL
qsv
bjH
bbi
-lwm
+guc
vfO
khu
kPw
@@ -111487,7 +111487,7 @@ rtP
qsv
lfd
eup
-lwm
+guc
xGa
khu
nsO
@@ -111744,7 +111744,7 @@ bDW
fJy
msW
ayr
-dRA
+rTs
wCe
khu
hUu
@@ -111996,12 +111996,12 @@ fJy
oUh
nWl
lKA
-ioy
-nAG
-see
-rIZ
-hPu
-rIP
+pEg
+nOL
+bFG
+rim
+wvw
+eGl
bDq
bDq
bDq
@@ -112253,7 +112253,7 @@ fKg
uhu
rOK
wWN
-wLw
+cse
gOz
fJy
pHj
@@ -112510,7 +112510,7 @@ fJy
fJy
gHI
gHI
-svo
+ofq
jXz
fJy
bJQ
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 43045de744d..dd96e6866f4 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -37,6 +37,10 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter)
+"abe" = (
+/obj/machinery/atmospherics/components/trinary/mixer/airmix,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/atmos)
"abt" = (
/obj/machinery/shower/directional/west,
/obj/structure/drain,
@@ -1019,6 +1023,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/science/ordnance/storage)
+"apk" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4
+ },
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/camera/directional/east{
+ c_tag = "Security Post - Engineering"
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/box,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/security/checkpoint/engineering)
"apl" = (
/obj/structure/spider/stickyweb,
/obj/machinery/power/port_gen/pacman,
@@ -2654,6 +2673,13 @@
/obj/item/plate,
/turf/open/floor/iron/kitchen,
/area/station/security/prison/mess)
+"aPf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/mob/living/basic/pet/dog/corgi/borgi,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
"aPj" = (
/obj/structure/table,
/obj/item/plant_analyzer,
@@ -5586,6 +5612,23 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
+"bLd" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/atmos{
+ name = "Atmospherics"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "atmoslock";
+ name = "Atmospherics Lockdown Blast Door"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/atmos)
"bLi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6249,6 +6292,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs/medium,
/area/station/cargo/storage)
+"bVh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Xenobiology - Cytology Cell";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
+ },
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/iron/dark/smooth_edge,
+/area/station/science/xenobiology)
"bVk" = (
/obj/structure/filingcabinet/chestdrawer/wheeled,
/obj/effect/turf_decal/siding/wood{
@@ -6629,26 +6687,6 @@
dir = 8
},
/area/station/commons/fitness/recreation/entertainment)
-"cbL" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Engineering Guard's Office"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/engie_guard,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/security/checkpoint/engineering)
"cbP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
@@ -8192,18 +8230,6 @@
"czs" = (
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/engine)
-"czC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/red/filled/warning{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/smooth,
-/area/station/security/checkpoint/engineering)
"cAd" = (
/obj/effect/turf_decal/stripes/box,
/obj/machinery/power/shieldwallgen/anchored{
@@ -14153,6 +14179,17 @@
/obj/effect/landmark/navigate_destination/chapel,
/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/fore)
+"eek" = (
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_y = -24
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/maintenance/disposal/incinerator)
"een" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -14482,6 +14519,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/department/medical/morgue)
+"eiT" = (
+/obj/structure/chair/stool/directional/south,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/grimy,
+/area/station/commons/lounge)
"eiV" = (
/obj/structure/table,
/obj/item/storage/medkit/brute{
@@ -14529,21 +14571,6 @@
/obj/structure/flora/rock/style_random,
/turf/open/misc/asteroid/airless,
/area/space/nearstation)
-"ejl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Xenobiology - Cytology Cell";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/obj/machinery/light/warm/directional/north,
-/turf/open/floor/iron/dark/smooth_edge,
-/area/station/science/xenobiology)
"ejt" = (
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/effect/turf_decal/bot,
@@ -14735,21 +14762,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison/mess)
-"ema" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/structure/bed/dogbed{
- anchored = 1;
- name = "Walter's bed"
- },
-/mob/living/simple_animal/pet/dog/dobermann/walter,
-/turf/open/floor/wood/large,
-/area/blueshield)
"emc" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/garbage,
@@ -14847,15 +14859,6 @@
/obj/effect/turf_decal/trimline/brown/filled,
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
-"enl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction/flip{
- dir = 1
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/lobby)
"ens" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -16354,6 +16357,21 @@
},
/turf/open/floor/iron/freezer,
/area/station/medical/chemistry)
+"eIK" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/effect/landmark/start/engineering_guard,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 4
+ },
+/area/station/engineering/lobby)
"eIL" = (
/obj/machinery/monkey_recycler,
/obj/effect/turf_decal/trimline/purple/filled/line,
@@ -18234,19 +18252,6 @@
dir = 4
},
/area/station/engineering/atmos)
-"fmZ" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/light/warm/directional/east,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/white/smooth_edge{
- dir = 8
- },
-/area/station/medical/medbay/lobby)
"fnb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth_large,
@@ -19579,12 +19584,6 @@
dir = 4
},
/area/station/hallway/primary/fore)
-"fIw" = (
-/obj/structure/chair/sofa/bench{
- dir = 8
- },
-/turf/open/floor/wood/large,
-/area/station/hallway/secondary/exit/departure_lounge)
"fIQ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -19613,6 +19612,15 @@
dir = 4
},
/area/station/hallway/primary/fore)
+"fJo" = (
+/obj/machinery/power/solar_control{
+ dir = 4;
+ id = "starboardsolar";
+ name = "Port Quarter Solar Control"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/solars/port/aft)
"fJp" = (
/obj/structure/railing{
dir = 4
@@ -20357,6 +20365,24 @@
},
/turf/open/floor/iron/edge,
/area/station/hallway/primary/fore)
+"fWt" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/machinery/light/warm/directional/north,
+/obj/machinery/camera/directional/north{
+ c_tag = "Service - Bar Fore";
+ name = "service camera"
+ },
+/obj/machinery/light_switch/directional/north{
+ pixel_x = 7
+ },
+/obj/machinery/firealarm/directional/north{
+ pixel_x = -4
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/grimy,
+/area/station/commons/lounge)
"fWu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/emcloset,
@@ -20614,20 +20640,6 @@
dir = 8
},
/area/station/engineering/gravity_generator)
-"fZI" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/machinery/firealarm/directional/east,
-/obj/structure/bed/dogbed{
- anchored = 1;
- name = "Markus's bed"
- },
-/mob/living/simple_animal/pet/dog/markus,
-/turf/open/floor/iron/smooth_edge{
- dir = 8
- },
-/area/station/cargo/office)
"fZK" = (
/obj/structure/showcase/cyborg/old{
dir = 8;
@@ -22191,15 +22203,6 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"gwk" = (
-/obj/structure/cable,
-/obj/machinery/power/solar_control{
- dir = 8;
- id = "starboardbow";
- name = "Starboard Bow Solar Control"
- },
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/station/maintenance/solars/starboard/fore)
"gws" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -24594,10 +24597,6 @@
/obj/effect/landmark/start/corrections_officer,
/turf/open/floor/glass/reinforced,
/area/station/security/office)
-"hdk" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix,
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/atmos)
"hdn" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -26503,6 +26502,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/starboard/aft)
+"hGi" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/structure/bed/dogbed{
+ anchored = 1;
+ name = "Walter's bed"
+ },
+/mob/living/basic/pet/dog/dobermann/walter,
+/turf/open/floor/wood/large,
+/area/blueshield)
"hGq" = (
/obj/structure/chair/office{
dir = 1
@@ -30552,6 +30566,31 @@
},
/turf/open/floor/iron/smooth_edge,
/area/station/engineering/main)
+"iPU" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = -6;
+ pixel_y = -24
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = 8;
+ pixel_y = -24
+ },
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_y = 32
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"iPZ" = (
/turf/closed/wall,
/area/station/maintenance/department/electrical)
@@ -30800,24 +30839,6 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/primary/fore)
-"iUs" = (
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/obj/machinery/light/warm/directional/north,
-/obj/machinery/camera/directional/north{
- c_tag = "Service - Bar Fore";
- name = "service camera"
- },
-/obj/machinery/light_switch/directional/north{
- pixel_x = 7
- },
-/obj/machinery/firealarm/directional/north{
- pixel_x = -4
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/grimy,
-/area/station/commons/lounge)
"iUy" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -32958,6 +32979,19 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos)
+"jyL" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/machinery/light/warm/directional/east,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/lobby)
"jyT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -33472,13 +33506,6 @@
dir = 8
},
/area/station/hallway/primary/central/aft)
-"jFc" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/mob/living/simple_animal/pet/dog/corgi/borgi,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
"jFt" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -34047,6 +34074,13 @@
/obj/item/stack/sheet/cardboard,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/engine)
+"jNn" = (
+/obj/structure/weightmachine/stacklifter,
+/obj/effect/turf_decal/tile/yellow/full,
+/obj/effect/turf_decal/bot,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/commons/fitness/recreation/entertainment)
"jNo" = (
/obj/structure/table,
/obj/item/trash/waffles,
@@ -34086,6 +34120,13 @@
dir = 4
},
/area/station/hallway/secondary/construction)
+"jNM" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/tile/yellow/full,
+/obj/effect/turf_decal/bot,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/commons/fitness/recreation/entertainment)
"jOa" = (
/obj/effect/turf_decal/trimline/dark_red/arrow_cw{
dir = 9
@@ -34355,6 +34396,26 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/prison)
+"jSu" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Engineering Guard's Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/engie_guard,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/security/checkpoint/engineering)
"jSx" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/turf/open/floor/iron/smooth_edge{
@@ -36941,31 +37002,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/gravity_generator)
-"kDU" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = -6;
- pixel_y = -24
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = 8;
- pixel_y = -24
- },
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_y = 32
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"kDW" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -40364,6 +40400,16 @@
dir = 8
},
/area/station/engineering/atmos)
+"lxZ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/engineering/lobby)
"lyi" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 4
@@ -40657,15 +40703,6 @@
/obj/item/storage/medkit/emergency,
/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/lobby)
-"lCP" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/lobby)
"lCU" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41056,6 +41093,18 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood,
/area/station/maintenance/rus_gambling)
+"lHZ" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/lobby)
"lIc" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -41566,16 +41615,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos/storage/gas)
-"lOY" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/yellow/filled/warning,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_edge{
- dir = 1
- },
-/area/station/engineering/lobby)
"lPa" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -43564,17 +43603,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/supply)
-"mqP" = (
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_y = -24
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/smooth_edge{
- dir = 1
- },
-/area/station/maintenance/disposal/incinerator)
"mqS" = (
/obj/machinery/door/airlock/security{
name = "Court Cell"
@@ -44161,14 +44189,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/security/brig)
-"mzu" = (
-/obj/docking_port/stationary{
- dir = 4;
- name = "DeltaStation emergency evac bay";
- shuttle_id = "emergency_home"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"mzy" = (
/obj/structure/chair{
dir = 8
@@ -45735,6 +45755,14 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/white/smooth_large,
/area/station/hallway/primary/fore)
+"mTI" = (
+/obj/docking_port/stationary{
+ dir = 4;
+ name = "DeltaStation emergency evac bay";
+ shuttle_id = "emergency_home"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"mTO" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -49034,6 +49062,15 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/drone_bay)
+"nNC" = (
+/obj/machinery/power/solar_control{
+ dir = 4;
+ id = "portbowsolar";
+ name = "Port Bow Solar Control"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/solars/port/fore)
"nNR" = (
/obj/structure/bed,
/obj/item/bedsheet/red,
@@ -50119,14 +50156,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
-"oaQ" = (
-/obj/docking_port/stationary{
- dir = 8;
- name = "arrivals";
- shuttle_id = "arrivals_stationary"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"oaZ" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 9
@@ -54917,15 +54946,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/port/fore)
-"ptN" = (
-/obj/machinery/power/solar_control{
- dir = 4;
- id = "portbowsolar";
- name = "Port Bow Solar Control"
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/station/maintenance/solars/port/fore)
"ptO" = (
/obj/machinery/door/airlock/maintenance{
name = "The Office"
@@ -55009,20 +55029,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/cargo/storage)
-"puq" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/mail_sorting/engineering/general,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "HoP Junction"
- },
-/turf/open/floor/iron/smooth_edge,
-/area/station/engineering/lobby)
"pus" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
@@ -55723,13 +55729,6 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/storage/gas)
-"pFT" = (
-/obj/structure/weightmachine/stacklifter,
-/obj/effect/turf_decal/tile/yellow/full,
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/commons/fitness/recreation/entertainment)
"pGh" = (
/turf/open/floor/iron/white/smooth_large,
/area/station/hallway/primary/fore)
@@ -56920,14 +56919,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/pod/dark,
/area/station/service/chapel/office)
-"pXt" = (
-/obj/docking_port/stationary{
- dir = 4;
- name = "Cargo Bay";
- shuttle_id = "cargo_home"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"pXz" = (
/obj/item/storage/fancy/candle_box,
/obj/structure/table/wood,
@@ -58887,6 +58878,18 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/foyer)
+"qyd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/warning{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/smooth,
+/area/station/security/checkpoint/engineering)
"qye" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood,
@@ -61474,15 +61477,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/prison/work)
-"rjs" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/south{
- id = "ChemStorage";
- name = "Shutter Control";
- req_access = list("pharmacy")
- },
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/medbay/central)
"rju" = (
/obj/structure/sign/clock/directional/east,
/obj/machinery/disposal/bin,
@@ -62398,6 +62392,12 @@
/obj/effect/turf_decal/delivery/blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"rxy" = (
+/obj/structure/chair/sofa/bench{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/station/hallway/secondary/exit/departure_lounge)
"rxO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
@@ -62852,21 +62852,6 @@
"rDp" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai)
-"rDr" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 8
- },
-/obj/effect/landmark/start/engineering_guard,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/smooth_edge{
- dir = 4
- },
-/area/station/engineering/lobby)
"rDu" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -63019,18 +63004,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/pod/dark,
/area/station/service/chapel)
-"rFl" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/structure/chair{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/white/smooth_edge{
- dir = 8
- },
-/area/station/medical/medbay/lobby)
"rFo" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 4
@@ -65451,6 +65424,15 @@
},
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/hos)
+"soW" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/lobby)
"soY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66292,11 +66274,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/maintenance/department/engine)
-"sAA" = (
-/obj/structure/chair/stool/directional/south,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/grimy,
-/area/station/commons/lounge)
"sAL" = (
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/iron/smooth,
@@ -67088,16 +67065,6 @@
/obj/structure/sign/warning/vacuum/external/directional/east,
/turf/open/floor/iron/small,
/area/station/hallway/secondary/exit/departure_lounge)
-"sJO" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_edge,
-/area/station/engineering/main)
"sKm" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/machinery/light/directional/south,
@@ -67416,6 +67383,15 @@
},
/turf/open/floor/carpet,
/area/station/service/library)
+"sNh" = (
+/obj/structure/cable,
+/obj/machinery/power/solar_control{
+ dir = 8;
+ id = "starboardbow";
+ name = "Starboard Bow Solar Control"
+ },
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/solars/starboard/fore)
"sNj" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
@@ -69123,6 +69099,20 @@
dir = 4
},
/area/station/engineering/atmos/pumproom)
+"tmk" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/mail_sorting/engineering/general,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "HoP Junction"
+ },
+/turf/open/floor/iron/smooth_edge,
+/area/station/engineering/lobby)
"tmv" = (
/obj/structure/chair/sofa/bench/left{
dir = 1
@@ -69207,15 +69197,6 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/iron/smooth,
/area/station/maintenance/aft/lesser)
-"tnD" = (
-/obj/machinery/power/solar_control{
- dir = 4;
- id = "starboardsolar";
- name = "Port Quarter Solar Control"
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/station/maintenance/solars/port/aft)
"tod" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard/metal,
@@ -70848,15 +70829,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/upper)
-"tIv" = (
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/ian,
-/obj/structure/sign/poster/official/work_for_a_future{
- pixel_x = 32
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/carpet/executive,
-/area/station/command/heads_quarters/hop)
"tIz" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/catwalk_floor/iron_smooth,
@@ -73855,21 +73827,6 @@
dir = 4
},
/area/station/engineering/atmos)
-"uyT" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 4
- },
-/obj/machinery/light_switch/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Security Post - Engineering"
- },
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/box,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/smooth_edge{
- dir = 8
- },
-/area/station/security/checkpoint/engineering)
"uzc" = (
/obj/structure/table,
/obj/machinery/door/firedoor,
@@ -75015,6 +74972,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"uPx" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/south{
+ id = "ChemStorage";
+ name = "Shutter Control";
+ req_access = list("pharmacy")
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/medbay/central)
"uPy" = (
/turf/open/floor/vault,
/area/station/ai_monitored/turret_protected/ai)
@@ -75804,6 +75770,15 @@
/obj/machinery/hydroponics/constructable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
+"vcb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/lobby)
"vcc" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -78469,6 +78444,14 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"vPt" = (
+/obj/docking_port/stationary{
+ dir = 4;
+ name = "Cargo Bay";
+ shuttle_id = "cargo_home"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"vPx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -78587,6 +78570,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/starboard/greater)
+"vRk" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/smooth_edge,
+/area/station/engineering/main)
"vRq" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -78846,23 +78839,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/edge,
/area/station/security/checkpoint/customs)
-"vUL" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/airlock/atmos{
- name = "Atmospherics"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "atmoslock";
- name = "Atmospherics Lockdown Blast Door"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/atmos)
"vUR" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
dir = 1
@@ -82318,6 +82294,15 @@
dir = 4
},
/area/station/service/hydroponics/garden)
+"wQu" = (
+/obj/structure/bed/dogbed/ian,
+/mob/living/basic/pet/dog/corgi/ian,
+/obj/structure/sign/poster/official/work_for_a_future{
+ pixel_x = 32
+ },
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/carpet/executive,
+/area/station/command/heads_quarters/hop)
"wQw" = (
/obj/structure/kitchenspike,
/obj/effect/turf_decal/weather/snow,
@@ -82778,6 +82763,20 @@
dir = 8
},
/area/station/commons/fitness/recreation/entertainment)
+"xaf" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/structure/bed/dogbed{
+ anchored = 1;
+ name = "Markus's bed"
+ },
+/mob/living/basic/pet/dog/markus,
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/cargo/office)
"xag" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -82976,13 +82975,6 @@
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/warden)
-"xcZ" = (
-/obj/structure/weightmachine/weightlifter,
-/obj/effect/turf_decal/tile/yellow/full,
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/commons/fitness/recreation/entertainment)
"xdB" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -84057,6 +84049,14 @@
/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/power_room)
+"xrP" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ name = "arrivals";
+ shuttle_id = "arrivals_stationary"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"xrZ" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 4
@@ -84637,22 +84637,6 @@
},
/turf/open/floor/wood/parquet,
/area/station/common/night_club)
-"xAN" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/structure/bed/dogbed/mcgriff{
- anchored = 1
- },
-/mob/living/simple_animal/pet/dog/pug/mcgriff,
-/obj/machinery/light/warm/directional/west,
-/obj/item/key/security,
-/obj/structure/cable,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
-/turf/open/floor/iron/dark/smooth_edge{
- dir = 4
- },
-/area/station/security/warden)
"xAV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -84936,6 +84920,26 @@
},
/turf/open/floor/pod/dark,
/area/station/service/chapel/funeral)
+"xFU" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/poddoor/preopen{
+ id = "engielock";
+ name = "Engineering Lockdown Blast Door"
+ },
+/obj/machinery/door/airlock/engineering/glass{
+ name = "EngineRoom"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
"xGe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -85467,26 +85471,6 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/station/command/heads_quarters/rd)
-"xNl" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "engielock";
- name = "Engineering Lockdown Blast Door"
- },
-/obj/machinery/door/airlock/engineering/glass{
- name = "EngineRoom"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/main)
"xNE" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/decal/cleanable/dirt,
@@ -86791,6 +86775,22 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/fore)
+"yhi" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/structure/bed/dogbed/mcgriff{
+ anchored = 1
+ },
+/mob/living/basic/pet/dog/pug/mcgriff,
+/obj/machinery/light/warm/directional/west,
+/obj/item/key/security,
+/obj/structure/cable,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/station/security/warden)
"yhr" = (
/obj/effect/turf_decal/trimline/dark_red/arrow_cw{
dir = 1
@@ -104465,7 +104465,7 @@ sKL
dWX
rMN
kVR
-ejl
+bVh
mMB
iEB
xQK
@@ -106896,7 +106896,7 @@ ttw
xtV
myq
sLD
-tnD
+fJo
xtV
uUU
uUU
@@ -107298,7 +107298,7 @@ eyR
oMs
tBt
fqs
-kDU
+iPU
nBM
nOt
qFu
@@ -109630,7 +109630,7 @@ odJ
ttw
ttw
ttw
-oaQ
+xrP
ttw
qjA
xMq
@@ -111764,7 +111764,7 @@ hFA
hrq
hrq
hrq
-hdk
+abe
fbD
dYh
hqu
@@ -111788,7 +111788,7 @@ ajK
ilm
dYh
wvK
-vUL
+bLd
hBC
vXB
mVr
@@ -112916,7 +112916,7 @@ veh
veh
pZx
sFE
-ptN
+nNC
veh
sdR
lYV
@@ -113850,7 +113850,7 @@ wme
xVm
tXe
kth
-mqP
+eek
oxP
dEF
jkI
@@ -115581,7 +115581,7 @@ dNH
abQ
gsd
sLU
-rjs
+uPx
fzP
wzJ
ocF
@@ -117544,7 +117544,7 @@ xWo
cmH
cpN
bRn
-ema
+hGi
kAm
lrc
xfl
@@ -117834,7 +117834,7 @@ nEm
kUf
qpy
ajz
-jFc
+aPf
kJi
lTr
jbi
@@ -118948,8 +118948,8 @@ jgd
xnw
twM
rfv
-uyT
-czC
+apk
+qyd
fmD
bYQ
jOC
@@ -119131,7 +119131,7 @@ hRW
irZ
tss
tOA
-iUs
+fWt
fUT
ckp
raW
@@ -119164,9 +119164,9 @@ cnC
hZK
vSC
arF
-fmZ
+jyL
pjL
-rFl
+lHZ
xgy
uQf
jLi
@@ -119206,7 +119206,7 @@ xnw
xnw
sxd
xnw
-cbL
+jSu
xnw
wOo
idO
@@ -119391,7 +119391,7 @@ tOA
tOA
oUR
fUT
-sAA
+eiT
kfu
euI
nPI
@@ -119463,7 +119463,7 @@ lPT
rTd
snR
mYQ
-rDr
+eIK
bbU
wBI
gQC
@@ -119720,7 +119720,7 @@ lPT
gMB
mmd
fdG
-lCP
+soW
paA
wBI
eXK
@@ -119977,7 +119977,7 @@ lPT
rri
lqJ
fdG
-lCP
+soW
xjQ
wBI
rll
@@ -120234,7 +120234,7 @@ vOe
auP
smV
fdG
-lCP
+soW
qfk
wBI
wBI
@@ -120491,7 +120491,7 @@ lPT
aAj
exn
fdG
-lCP
+soW
wrO
vti
dih
@@ -120745,13 +120745,13 @@ uit
qCR
dJj
pBR
-puq
+tmk
fol
oxL
-enl
-lOY
-xNl
-sJO
+vcb
+lxZ
+xFU
+vRk
qQu
pkH
qQu
@@ -123029,9 +123029,9 @@ dLv
pCt
cKW
drm
-xcZ
+jNM
uxS
-pFT
+jNn
gbo
ibt
ibt
@@ -123999,7 +123999,7 @@ aDR
aDR
aDR
iUK
-xAN
+yhi
kot
gVR
gkP
@@ -126793,7 +126793,7 @@ brf
sDX
eLW
lGY
-tIv
+wQu
iyK
ntp
dxq
@@ -128336,7 +128336,7 @@ taf
taf
goe
woM
-gwk
+sNh
taf
taf
kvn
@@ -128407,7 +128407,7 @@ qye
ykh
wtQ
bQf
-fIw
+rxy
mSR
aqs
gvt
@@ -128708,7 +128708,7 @@ tMj
fOm
dGU
lyi
-fZI
+xaf
wyE
ken
hJC
@@ -131785,7 +131785,7 @@ ttw
ttw
ttw
ttw
-pXt
+vPt
ttw
ttw
ttw
@@ -133031,7 +133031,7 @@ ttw
ttw
ttw
ttw
-mzu
+mTI
ttw
ttw
ttw
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm
index 5a7c2e0f818..6ead81a7ea7 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm
@@ -56,7 +56,7 @@
/turf/closed/mineral/random/stationside/asteroid/porus,
/area/station/maintenance/department/crew_quarters/dorms)
"fL" = (
-/mob/living/simple_animal/pet/dog/bullterrier{
+/mob/living/basic/pet/dog/bullterrier{
desc = "walter";
name = "walter"
},
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index ce57fd15e9c..a054f13cb8b 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -220,6 +220,9 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
+"aeZ" = (
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"aff" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -903,6 +906,11 @@
"arE" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/greater)
+"arH" = (
+/obj/effect/turf_decal/trimline/white/tram,
+/obj/machinery/crossing_signal/northwest,
+/turf/open/floor/iron,
+/area/station/hallway/primary/tram/right)
"arI" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/paper/guides/jobs/hydroponics,
@@ -926,21 +934,6 @@
/obj/item/seeds/tower,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
-"asf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/cable/layer3,
-/mob/living/simple_animal/bot/secbot/pingsky{
- dir = 1
- },
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"asv" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"asw" = (
/obj/machinery/computer/monitor{
dir = 8
@@ -1164,13 +1157,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"ayQ" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/right)
"ayW" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -1268,14 +1254,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"aBv" = (
-/obj/structure/industrial_lift/tram{
- icon_state = "plating"
- },
-/obj/structure/grille/tram,
-/obj/structure/window/reinforced/shuttle/tram,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"aBM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/chair{
@@ -1633,6 +1611,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"aKe" = (
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"aKm" = (
/obj/structure/chair/office/light{
dir = 4
@@ -1648,6 +1630,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
+"aKv" = (
+/obj/structure/industrial_lift/tram{
+ icon_state = "titanium"
+ },
+/obj/effect/landmark/lift_id,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"aKy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1807,6 +1796,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/tram/left)
+"aNL" = (
+/obj/machinery/vending/dinnerware,
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/elevator_control_panel/directional/north{
+ desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
+ linked_elevator_id = "dumbwaiter_lift";
+ name = "Dumbwaiter Control Panel";
+ preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
+ },
+/turf/open/floor/iron/white,
+/area/station/service/kitchen)
"aNP" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -1820,6 +1820,23 @@
"aOn" = (
/turf/closed/wall,
/area/station/engineering/storage/tech)
+"aON" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/obj/machinery/elevator_control_panel/directional/south{
+ desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
+ linked_elevator_id = "dumbwaiter_lift";
+ name = "Dumbwaiter Control Panel";
+ preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"aOR" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/light_switch/directional/north,
@@ -1942,6 +1959,14 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/lavaland/surface)
+"aRY" = (
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/requests_console/directional/south{
+ department = "Genetics";
+ name = "Genetics Requests Console"
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"aSe" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -2452,13 +2477,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"bdr" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"bdz" = (
/obj/structure/railing/corner{
dir = 1
@@ -3012,6 +3030,14 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
+"bmg" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/right)
"bmE" = (
/obj/effect/turf_decal/trimline/yellow/warning,
/obj/effect/decal/cleanable/dirt,
@@ -3164,6 +3190,16 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"boZ" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/chair/sofa{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"bpa" = (
/obj/machinery/modular_computer/console/preset/civilian{
dir = 4
@@ -3454,14 +3490,6 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
-"bvm" = (
-/obj/structure/chair/sofa/corner{
- dir = 8
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/station/science/breakroom)
"bvH" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -3486,6 +3514,17 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"bvL" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/left)
"bvM" = (
/obj/machinery/computer/mech_bay_power_console,
/turf/open/floor/iron,
@@ -3571,15 +3610,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
-"bwZ" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"bxh" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/warning,
@@ -3976,12 +4006,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"bDm" = (
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"bDo" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -4140,23 +4164,6 @@
"bFq" = (
/turf/closed/wall,
/area/station/medical/psychology)
-"bFw" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
- pixel_x = -7;
- pixel_y = 7
- },
-/obj/machinery/camera{
- c_tag = "Science - Genetics";
- dir = 9;
- network = list("ss13","rd")
- },
-/obj/item/infuser_book{
- pixel_x = 5;
- pixel_y = 3
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"bFF" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -4501,17 +4508,6 @@
/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/fitness/recreation/entertainment)
-"bLT" = (
-/obj/effect/turf_decal/siding/thinplating/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/corner{
- dir = 4
- },
-/obj/structure/bed/dogbed/mcgriff,
-/mob/living/simple_animal/pet/dog/pug/mcgriff,
-/turf/open/floor/glass/reinforced,
-/area/station/security/warden)
"bMb" = (
/turf/closed/wall,
/area/station/hallway/primary/tram/right)
@@ -4750,6 +4746,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/tram/right)
+"bPz" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/machinery/camera/directional/south{
+ c_tag = "Hallway - Eastern Tram Bridge 1"
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/center)
"bPB" = (
/obj/machinery/door/airlock/external/glass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5372,12 +5381,6 @@
},
/turf/open/floor/iron/white,
/area/station/security/execution/education)
-"cam" = (
-/obj/structure/flora/bush/lavendergrass/style_random,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/grass,
-/area/station/science/genetics)
"caw" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -6012,6 +6015,15 @@
/obj/effect/mapping_helpers/airlock/access/all/science/general,
/turf/open/floor/iron,
/area/station/science/research)
+"cjQ" = (
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/open/floor/noslip/tram_platform,
+/area/station/hallway/primary/tram/right)
"cjT" = (
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
@@ -6095,6 +6107,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"ckX" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/machinery/camera/directional/south{
+ c_tag = "Hallway - Western Tram Bridge 2"
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/center)
"cli" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -6205,6 +6230,13 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/engine/n2o,
/area/station/engineering/atmos)
+"cnN" = (
+/obj/effect/turf_decal/trimline/white/tram{
+ dir = 1
+ },
+/obj/machinery/crossing_signal/southwest,
+/turf/open/floor/iron,
+/area/station/hallway/primary/tram/right)
"cnV" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -6480,6 +6512,12 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"csj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/turf/open/floor/iron,
+/area/station/ai_monitored/security/armory)
"csq" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -6592,6 +6630,13 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"cti" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"cts" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/structure/sign/gym/mirrored{
@@ -7451,6 +7496,32 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"cGI" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
+ },
+/obj/machinery/button/door/directional/west{
+ id = "atmos";
+ name = "Atmospherics Lockdown";
+ pixel_y = 8;
+ req_access = list("atmospherics")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "Secure Storage";
+ name = "Engineering Secure Storage";
+ req_access = list("engine_equip")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "Engineering";
+ name = "Engineering Lockdown";
+ pixel_y = -8;
+ req_access = list("engineering")
+ },
+/obj/structure/sign/clock/directional/north,
+/mob/living/simple_animal/parrot/poly,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"cGS" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -7955,6 +8026,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"cQL" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/chair/sofa/corner,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"cQY" = (
/obj/structure/closet/secure_closet/freezer/meat,
/obj/effect/turf_decal/weather/snow,
@@ -8506,6 +8585,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"daz" = (
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/station/science/breakroom)
"daB" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/shower{
@@ -8716,17 +8803,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/central/greater)
-"deW" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_y = 32
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"dfh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -9131,21 +9207,12 @@
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/plating,
/area/station/hallway/primary/tram/center)
-"dns" = (
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"dnB" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/turf/open/floor/wood,
/area/station/commons/dorms)
-"dnD" = (
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"dnE" = (
/obj/machinery/telecomms/server/presets/service,
/turf/open/floor/iron/dark/telecomms,
@@ -10247,13 +10314,6 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
-"dEo" = (
-/obj/effect/turf_decal/trimline/white/tram{
- dir = 1
- },
-/obj/machinery/crossing_signal/southwest,
-/turf/open/floor/iron,
-/area/station/hallway/primary/tram/right)
"dEv" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/security/armory)
@@ -10401,6 +10461,17 @@
/obj/machinery/teleport/hub,
/turf/open/floor/plating,
/area/station/command/teleporter)
+"dHq" = (
+/obj/effect/landmark/tram/middle_part,
+/obj/machinery/computer/tram_controls{
+ icon_keyboard = null;
+ icon_state = "tram_controls"
+ },
+/obj/structure/industrial_lift/tram{
+ icon_state = "titanium"
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"dHs" = (
/obj/structure/lattice/catwalk,
/obj/machinery/door/poddoor/preopen{
@@ -10597,6 +10668,19 @@
"dME" = (
/turf/closed/wall,
/area/station/service/theater)
+"dMO" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/machinery/camera/directional/south{
+ c_tag = "Hallway - Western Tram Bridge 1"
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/left)
"dMR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10713,6 +10797,9 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"dPb" = (
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/left)
"dPc" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -11112,6 +11199,13 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
+"dWy" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/monkeycubes{
+ pixel_x = -5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"dWK" = (
/turf/open/floor/iron,
/area/station/service/janitor)
@@ -11377,6 +11471,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"eaN" = (
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/right)
"eaZ" = (
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical{
@@ -11792,6 +11889,12 @@
},
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"eiB" = (
+/obj/structure/industrial_lift/tram{
+ icon_state = "titanium"
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"eiC" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/light/small/directional/west,
@@ -12638,13 +12741,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"ezQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"ezX" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -13062,15 +13158,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"eGA" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"eGS" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
@@ -13292,25 +13379,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"eMv" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/left)
-"eMH" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/obj/effect/turf_decal/caution/stand_clear/white{
- dir = 8
- },
-/turf/open/floor/noslip/tram_platform,
-/area/station/hallway/primary/tram/left)
"eMV" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
@@ -13839,28 +13907,6 @@
/obj/structure/sign/clock/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness)
-"eVi" = (
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/neutral/filled/line,
-/obj/machinery/camera/directional/south{
- c_tag = "Maintenance - East Tram Tunnel 4"
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=TramLower11";
- location = "TramLower10"
- },
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/mob/living/simple_animal/bot/secbot/beepsky/officer,
-/turf/open/floor/iron,
-/area/station/maintenance/tram/right)
"eVl" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom/directional/north{
@@ -14039,12 +14085,6 @@
/mob/living/basic/mouse,
/turf/open/floor/plating,
/area/station/maintenance/tram/right)
-"eZs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/mob/living/carbon/human/species/monkey/punpun,
-/turf/open/floor/iron/dark,
-/area/station/service/bar)
"eZT" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
@@ -14132,11 +14172,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/carpet,
/area/station/cargo/miningdock)
-"fbM" = (
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/left)
"fcs" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -14497,6 +14532,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"fjE" = (
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/station/science/breakroom)
+"fjK" = (
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"fjN" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -14671,14 +14718,6 @@
/obj/effect/landmark/navigate_destination/hydro,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"flZ" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/chair/sofa/corner,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"fmf" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -15039,6 +15078,10 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"ftK" = (
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"ftP" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/shower{
@@ -15454,6 +15497,13 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"fBy" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/right)
"fBG" = (
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood,
@@ -17413,13 +17463,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
-"gnI" = (
-/obj/structure/chair/sofa/right{
- dir = 8
- },
-/obj/structure/sign/calendar/directional/east,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"gnM" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
@@ -17447,6 +17490,9 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"gov" = (
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"goR" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel Office"
@@ -17677,6 +17723,14 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"gsI" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/chair/sofa/right,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"gsT" = (
/obj/structure/easel,
/obj/item/canvas/nineteen_nineteen,
@@ -18521,6 +18575,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"gIK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/mob/living/carbon/human/species/monkey/punpun,
+/turf/open/floor/iron/dark,
+/area/station/service/bar)
"gIT" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Server Room"
@@ -18642,6 +18702,16 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"gKs" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/cable/layer3,
+/mob/living/simple_animal/bot/secbot/pingsky{
+ dir = 1
+ },
+/turf/open/floor/circuit,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"gKA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -19590,6 +19660,17 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"hay" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/right)
"haH" = (
/obj/structure/chair{
dir = 1
@@ -19633,6 +19714,10 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/art)
+"hbC" = (
+/obj/effect/landmark/tram/right_part,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/right)
"hbH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20187,12 +20272,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/wood/large,
/area/station/service/library)
-"hnT" = (
-/obj/structure/flora/bush/lavendergrass/style_random,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/carbon/human/species/monkey,
-/turf/open/floor/grass,
-/area/station/science/genetics)
"hnW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20256,17 +20335,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"hpI" = (
-/obj/machinery/vending/dinnerware,
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/elevator_control_panel/directional/north{
- desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
- linked_elevator_id = "dumbwaiter_lift";
- name = "Dumbwaiter Control Panel";
- preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
- },
-/turf/open/floor/iron/white,
-/area/station/service/kitchen)
"hqi" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
@@ -20561,6 +20629,16 @@
"hvJ" = (
/turf/closed/wall/r_wall,
/area/station/science/server)
+"hvX" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/right)
"hvZ" = (
/obj/effect/turf_decal/siding/thinplating/corner{
dir = 8
@@ -20733,6 +20811,17 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
+"hAP" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 6
+ },
+/mob/living/basic/pet/dog/pug{
+ desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping.";
+ name = "Spaghetti"
+ },
+/obj/structure/bed/dogbed/ian,
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
"hAR" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -21768,12 +21857,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"hUj" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
-/turf/open/floor/iron,
-/area/station/ai_monitored/security/armory)
"hUx" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 5
@@ -21993,6 +22076,17 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"hXL" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/weather/snow,
+/mob/living/simple_animal/hostile/retaliate/goat{
+ name = "Pete"
+ },
+/turf/open/floor/iron/kitchen_coldroom,
+/area/station/service/kitchen/coldroom)
"hXO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing,
@@ -22159,13 +22253,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
-"iaZ" = (
-/obj/structure/bed/dogbed/ian,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/obj/machinery/firealarm/directional/east,
-/mob/living/simple_animal/pet/dog/corgi/ian,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"ibg" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -22238,9 +22325,6 @@
"icx" = (
/turf/open/floor/circuit/green,
/area/station/science/robotics/mechbay)
-"icF" = (
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"icL" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 10
@@ -22279,6 +22363,11 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"idp" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"idq" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -22668,6 +22757,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
+"ijJ" = (
+/obj/structure/bed/dogbed/runtime,
+/obj/machinery/light/directional/north,
+/obj/structure/sign/clock/directional/north,
+/mob/living/simple_animal/pet/cat/runtime,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/cmo)
"ijL" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -22679,6 +22775,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
+"ijO" = (
+/obj/structure/chair/sofa/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/station/science/breakroom)
"ikn" = (
/obj/machinery/light/small/directional/south,
/obj/structure/closet/emcloset,
@@ -22987,16 +23091,6 @@
},
/turf/open/floor/plating,
/area/station/science/server)
-"irc" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/center)
"ird" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/siding/thinplating{
@@ -23381,6 +23475,12 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/tram/right)
+"ixx" = (
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"ixO" = (
/obj/structure/chair/comfy/brown{
buildstackamount = 0;
@@ -23622,6 +23722,14 @@
},
/turf/open/floor/iron/textured_large,
/area/station/security/execution/education)
+"iBo" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/left)
"iBx" = (
/obj/machinery/vending/modularpc,
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -23657,12 +23765,6 @@
},
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
-"iCz" = (
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"iCA" = (
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
@@ -23743,16 +23845,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/port/central)
-"iDt" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/right)
"iDv" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -23810,6 +23902,14 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
+"iEV" = (
+/obj/structure/industrial_lift/tram{
+ icon_state = "plating"
+ },
+/obj/structure/grille/tram,
+/obj/structure/window/reinforced/shuttle/tram,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"iFb" = (
/obj/machinery/portable_atmospherics/pump{
name = "Lil Pump"
@@ -24153,10 +24253,6 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
-"iMR" = (
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"iNg" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -24380,6 +24476,16 @@
},
/turf/open/floor/plating,
/area/station/maintenance/tram/left)
+"iRU" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/center)
"iRW" = (
/obj/structure/chair{
dir = 4;
@@ -24575,6 +24681,16 @@
/obj/machinery/power/energy_accumulator/grounding_rod/anchored,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"iUz" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/left)
"iUE" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "prisondorm";
@@ -24724,32 +24840,6 @@
/obj/structure/sign/departments/vault/directional/south,
/turf/open/floor/carpet,
/area/station/command/bridge)
-"iXc" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 9
- },
-/obj/machinery/button/door/directional/west{
- id = "atmos";
- name = "Atmospherics Lockdown";
- pixel_y = 8;
- req_access = list("atmospherics")
- },
-/obj/machinery/button/door/directional/west{
- id = "Secure Storage";
- name = "Engineering Secure Storage";
- req_access = list("engine_equip")
- },
-/obj/machinery/button/door/directional/west{
- id = "Engineering";
- name = "Engineering Lockdown";
- pixel_y = -8;
- req_access = list("engineering")
- },
-/obj/structure/sign/clock/directional/north,
-/mob/living/simple_animal/parrot/poly,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"iXw" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/regular{
@@ -24872,17 +24962,6 @@
},
/turf/open/floor/iron,
/area/station/science/lab)
-"iZG" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/right)
"iZM" = (
/obj/structure/chair{
dir = 4
@@ -24904,19 +24983,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"jar" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/center)
"jay" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/window/reinforced,
@@ -25109,6 +25175,19 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"jeW" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/airlock_controller/incinerator_atmos{
+ pixel_x = 40;
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/turf/open/floor/engine,
+/area/station/maintenance/disposal/incinerator)
"jfd" = (
/obj/structure/chair/office{
dir = 4
@@ -25168,12 +25247,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"jgk" = (
-/obj/machinery/computer/order_console/cook,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/service)
"jgq" = (
/obj/structure/railing/corner,
/turf/open/floor/glass/reinforced,
@@ -25192,6 +25265,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"jgV" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/machinery/camera/directional/south{
+ c_tag = "Hallway - Eastern Tram Bridge 2"
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/right)
"jhd" = (
/turf/open/space/openspace,
/area/space)
@@ -25669,6 +25755,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"jpZ" = (
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/obj/structure/sign/calendar/directional/east,
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"jql" = (
/obj/machinery/door/airlock/command{
name = "Research Division Server Room"
@@ -26051,6 +26144,13 @@
},
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
+"jvN" = (
+/obj/structure/industrial_lift/tram{
+ icon_state = "titanium"
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"jwr" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/spawner/random/structure/girder,
@@ -26186,6 +26286,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"jza" = (
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"jzd" = (
/obj/structure/chair,
/obj/structure/window/reinforced/spawner/east,
@@ -26372,6 +26480,17 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"jDa" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/obj/structure/bed/dogbed/mcgriff,
+/mob/living/basic/pet/dog/pug/mcgriff,
+/turf/open/floor/glass/reinforced,
+/area/station/security/warden)
"jDc" = (
/obj/machinery/door/airlock/research{
id_tag = "ResearchExt";
@@ -26546,10 +26665,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/greater)
-"jGX" = (
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"jGZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/machinery/door/poddoor/preopen{
@@ -26704,14 +26819,6 @@
},
/turf/open/floor/iron/checker,
/area/station/commons/lounge)
-"jJM" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"jJO" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -27120,6 +27227,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"jQH" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"jQJ" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
@@ -27791,6 +27905,13 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"kdx" = (
+/obj/effect/turf_decal/trimline/white/tram{
+ dir = 1
+ },
+/obj/machinery/crossing_signal/southwest,
+/turf/open/floor/iron,
+/area/station/hallway/primary/tram/center)
"kdL" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
@@ -28825,9 +28946,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"kvz" = (
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"kvH" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -30159,6 +30277,13 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"kTc" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"kTf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
@@ -30613,11 +30738,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"kYX" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"kYZ" = (
/obj/machinery/airalarm/server{
dir = 4;
@@ -30628,10 +30748,6 @@
},
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
-"kZb" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"kZh" = (
/turf/open/floor/eighties/red,
/area/station/commons/fitness/recreation/entertainment)
@@ -32117,17 +32233,6 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"lzb" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/left)
"lzo" = (
/obj/machinery/door/window/left/directional/south,
/turf/open/floor/grass,
@@ -32432,6 +32537,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"lFY" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"lFZ" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/item/radio/intercom/directional/south,
@@ -32538,6 +32651,9 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"lId" = (
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"lIs" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/turf/open/floor/iron/white,
@@ -33087,6 +33203,12 @@
/obj/structure/cable/layer3,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"lSm" = (
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"lSo" = (
/turf/open/floor/glass/reinforced,
/area/station/security/brig)
@@ -33911,6 +34033,10 @@
},
/turf/open/floor/iron/white,
/area/station/service/kitchen)
+"mjl" = (
+/obj/structure/flora/tree/palm/style_random,
+/turf/open/floor/grass,
+/area/station/science/genetics)
"mjm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34274,6 +34400,10 @@
"moz" = (
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"moD" = (
+/obj/effect/landmark/tram/left_part,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/left)
"moP" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
@@ -34517,6 +34647,17 @@
/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"muz" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_y = 32
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"muK" = (
/obj/machinery/telecomms/server/presets/science,
/turf/open/floor/iron/dark/telecomms,
@@ -35990,13 +36131,6 @@
/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
/turf/open/floor/iron,
/area/station/security/office)
-"mTe" = (
-/obj/structure/chair/sofa/left{
- dir = 8
- },
-/obj/structure/sign/clock/directional/east,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"mTm" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -36227,13 +36361,6 @@
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/iron/kitchen_coldroom,
/area/station/service/kitchen/coldroom)
-"mXp" = (
-/obj/structure/industrial_lift/tram{
- icon_state = "titanium"
- },
-/obj/effect/landmark/lift_id,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"mXu" = (
/obj/structure/sign/warning/vacuum{
pixel_y = -32
@@ -36314,6 +36441,19 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"mYv" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/center)
"mYA" = (
/obj/machinery/door/airlock/security{
name = "Courtroom Holding Area"
@@ -36835,13 +36975,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"ngS" = (
-/obj/structure/chair/sofa{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
"ngU" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -37225,13 +37358,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
-"nnF" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"nnG" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -37362,19 +37488,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
-"npL" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/right)
"npM" = (
/obj/structure/disposaloutlet,
/obj/structure/disposalpipe/trunk{
@@ -37669,6 +37782,10 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"nwb" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"nwd" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -37972,6 +38089,11 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
+"nBf" = (
+/obj/effect/turf_decal/trimline/white/tram,
+/obj/machinery/crossing_signal/northwest,
+/turf/open/floor/iron,
+/area/station/hallway/primary/tram/center)
"nBu" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
@@ -38291,6 +38413,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"nIV" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/right)
"nJo" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -39162,9 +39297,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"obb" = (
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"obp" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
@@ -39222,14 +39354,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
-"obR" = (
-/obj/structure/chair/sofa/right{
- dir = 8
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/station/science/breakroom)
"obT" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -39377,19 +39501,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/ai_monitored/command/nuke_storage)
-"ody" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/machinery/camera/directional/south{
- c_tag = "Hallway - Eastern Tram Bridge 2"
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/right)
"odF" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
@@ -39513,10 +39624,6 @@
/obj/structure/table/wood,
/turf/open/floor/wood/tile,
/area/station/service/chapel)
-"ogy" = (
-/obj/machinery/dna_infuser,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"ogY" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
@@ -39922,17 +40029,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"oph" = (
-/obj/effect/landmark/tram/middle_part,
-/obj/machinery/computer/tram_controls{
- icon_keyboard = null;
- icon_state = "tram_controls"
- },
-/obj/structure/industrial_lift/tram{
- icon_state = "titanium"
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"opr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -40228,17 +40324,6 @@
/obj/item/pillow/random,
/turf/open/floor/carpet,
/area/station/commons/dorms)
-"oux" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 6
- },
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/pug{
- desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping.";
- name = "Spaghetti"
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
"ouJ" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 9
@@ -40777,6 +40862,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
+"oGP" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor,
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/center)
"oGQ" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
@@ -40910,10 +41006,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
-"oJj" = (
-/obj/structure/flora/tree/palm/style_random,
-/turf/open/floor/grass,
-/area/station/science/genetics)
"oJu" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/table/glass,
@@ -41359,14 +41451,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"oSW" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/right)
"oTa" = (
/obj/structure/railing{
dir = 9
@@ -41692,19 +41776,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"oZh" = (
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_x = 40;
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
"oZm" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -42154,6 +42225,23 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"phT" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/monkeycubes{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/machinery/camera{
+ c_tag = "Science - Genetics";
+ dir = 9;
+ network = list("ss13","rd")
+ },
+/obj/item/infuser_book{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"pib" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/red/filled/corner{
@@ -42167,6 +42255,16 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/security/prison)
+"pif" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/chair/sofa/corner{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"pis" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/yellow/filled/corner{
@@ -43025,13 +43123,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
/turf/open/floor/plating,
/area/station/engineering/transit_tube)
-"pwe" = (
-/obj/structure/bed/dogbed/runtime,
-/obj/machinery/light/directional/north,
-/obj/structure/sign/clock/directional/north,
-/mob/living/simple_animal/pet/cat/runtime,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/cmo)
"pwp" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43721,6 +43812,11 @@
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai)
+"pIS" = (
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/right)
"pJg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -44049,19 +44145,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"pOk" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/machinery/camera/directional/south{
- c_tag = "Hallway - Western Tram Bridge 1"
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/left)
"pOo" = (
/obj/structure/table,
/obj/structure/cable,
@@ -44072,10 +44155,6 @@
/obj/machinery/light/floor,
/turf/open/floor/iron,
/area/station/security/prison)
-"pOx" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"pOy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -44139,23 +44218,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/processing)
-"pPN" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 8
- },
-/obj/machinery/elevator_control_panel/directional/south{
- desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
- linked_elevator_id = "dumbwaiter_lift";
- name = "Dumbwaiter Control Panel";
- preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
"pQd" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
@@ -44326,6 +44388,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"pUA" = (
+/obj/structure/flora/bush/lavendergrass/style_random,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/grass,
+/area/station/science/genetics)
"pUF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -44690,16 +44758,6 @@
/obj/machinery/light/warm/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"qal" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/chair/sofa/corner{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"qar" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
@@ -44933,6 +44991,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/brig)
+"qfi" = (
+/obj/structure/bed/dogbed/ian,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/obj/machinery/firealarm/directional/east,
+/mob/living/basic/pet/dog/corgi/ian,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"qfj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/wood,
@@ -45104,12 +45169,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"qia" = (
-/obj/structure/industrial_lift/tram{
- icon_state = "titanium"
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"qif" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -45276,6 +45335,11 @@
},
/turf/open/openspace,
/area/station/security/brig)
+"qku" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"qkx" = (
/obj/machinery/door/airlock/research{
name = "Ordnance Lab"
@@ -45442,15 +45506,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
-"qoE" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/left)
"qoX" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 6
@@ -45828,6 +45883,12 @@
/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"qtS" = (
+/obj/machinery/computer/order_console/cook,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/service)
"qtZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "MiniSat Maintenance"
@@ -47018,6 +47079,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"qLy" = (
+/obj/structure/flora/bush/lavendergrass/style_random,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/grass,
+/area/station/science/genetics)
"qLG" = (
/obj/structure/table/wood,
/obj/machinery/light/warm/directional/east,
@@ -47971,6 +48038,12 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/treatment_center)
+"rgM" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/cable,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"rhc" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -48008,11 +48081,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"rhW" = (
-/obj/effect/turf_decal/trimline/white/tram,
-/obj/machinery/crossing_signal/northwest,
-/turf/open/floor/iron,
-/area/station/hallway/primary/tram/center)
"rib" = (
/obj/structure/fluff/tram_rail/anchor{
dir = 1
@@ -48750,14 +48818,6 @@
"rvr" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
-"rvu" = (
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/requests_console/directional/south{
- department = "Genetics";
- name = "Genetics Requests Console"
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"rvD" = (
/obj/machinery/camera/directional/west{
c_tag = "Hallway - Service Wing Right Stairway"
@@ -49416,6 +49476,10 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"rGS" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/right)
"rGU" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -50057,19 +50121,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/hallway/primary/tram/center)
-"rPi" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/machinery/camera/directional/south{
- c_tag = "Hallway - Eastern Tram Bridge 1"
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/center)
"rPj" = (
/obj/effect/turf_decal/box/white{
color = "#9FED58"
@@ -50743,14 +50794,6 @@
/obj/structure/cable/layer3,
/turf/open/floor/iron,
/area/station/engineering/main)
-"scY" = (
-/obj/structure/chair/sofa/left{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/station/science/breakroom)
"sdc" = (
/obj/structure/chair/office/light{
dir = 1
@@ -51042,13 +51085,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"sjd" = (
-/obj/structure/industrial_lift/tram{
- icon_state = "titanium"
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/center)
"sjf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51530,6 +51566,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"suw" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"suy" = (
/obj/structure/closet/secure_closet/brig,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -52255,19 +52300,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
-"sIX" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/machinery/camera/directional/south{
- c_tag = "Hallway - Western Tram Bridge 2"
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/center)
"sJg" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -52355,13 +52387,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
-"sKS" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
- pixel_x = -5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"sLf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -52775,9 +52800,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
-"sRW" = (
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/right)
"sRZ" = (
/turf/closed/wall/r_wall,
/area/station/science/lobby)
@@ -53296,16 +53318,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
-"taK" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/chair/sofa/left{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"taP" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
@@ -53451,9 +53463,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"tep" = (
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"tey" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -53830,6 +53839,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"tnc" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"tnh" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/trimline/red/filled/corner,
@@ -54384,13 +54402,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"ttS" = (
-/obj/effect/turf_decal/trimline/white/tram{
- dir = 1
- },
-/obj/machinery/crossing_signal/southwest,
-/turf/open/floor/iron,
-/area/station/hallway/primary/tram/center)
"tug" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/unary/passive_vent{
@@ -56183,15 +56194,6 @@
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"uff" = (
-/obj/effect/turf_decal/caution/stand_clear/white{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/turf/open/floor/noslip/tram_platform,
-/area/station/hallway/primary/tram/right)
"ufj" = (
/obj/machinery/computer/upload/borg{
dir = 8
@@ -56265,17 +56267,6 @@
},
/turf/open/floor/iron,
/area/station/security/office)
-"ugb" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/weather/snow,
-/mob/living/simple_animal/hostile/retaliate/goat{
- name = "Pete"
- },
-/turf/open/floor/iron/kitchen_coldroom,
-/area/station/service/kitchen/coldroom)
"ugc" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/airalarm/directional/north,
@@ -56444,6 +56435,11 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"uir" = (
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/left)
"uiv" = (
/obj/structure/window/reinforced/spawner/west,
/turf/open/floor/iron/white/smooth_corner{
@@ -56466,12 +56462,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/maintenance/radshelter/civil)
-"uji" = (
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"ujn" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
@@ -57401,9 +57391,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"uAL" = (
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"uAP" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -57791,14 +57778,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"uIC" = (
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"uIO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -58291,6 +58270,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
+"uTb" = (
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"uTg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58535,19 +58517,6 @@
/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
-"uWq" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/left)
"uWr" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing,
@@ -58665,11 +58634,6 @@
},
/turf/open/floor/carpet,
/area/station/service/chapel/monastery)
-"uZg" = (
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/right)
"uZn" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 5
@@ -58888,6 +58852,10 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"vcB" = (
+/obj/machinery/dna_infuser,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"vcH" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -59004,6 +58972,15 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"vfC" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 8
+ },
+/turf/open/floor/noslip/tram_platform,
+/area/station/hallway/primary/tram/left)
"vfD" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 4
@@ -59370,6 +59347,23 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
+"vns" = (
+/obj/machinery/computer/order_console/mining,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/structure/disposalpipe/trunk/multiz{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"vnD" = (
/obj/structure/reagent_dispensers/fueltank/large,
/obj/effect/turf_decal/bot{
@@ -59838,6 +59832,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"vvm" = (
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/center)
"vvv" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
@@ -59940,6 +59939,12 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"vwT" = (
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"vwZ" = (
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
@@ -60321,10 +60326,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"vEa" = (
-/obj/effect/landmark/tram/right_part,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/right)
"vEe" = (
/obj/structure/window/reinforced/spawner,
/obj/machinery/chem_heater/withbuffer,
@@ -60377,17 +60378,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"vFg" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/structure/holosign/barrier/atmos/tram,
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/vault{
- base_icon_state = "tram2";
- icon_state = "tram2";
- desc = "A sturdy looking tram platform.";
- name = "tram platform"
- },
-/area/station/hallway/primary/tram/center)
"vFp" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 5
@@ -60473,6 +60463,28 @@
/obj/machinery/holopad,
/turf/open/floor/wood/large,
/area/station/service/theater)
+"vGR" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/camera/directional/south{
+ c_tag = "Maintenance - East Tram Tunnel 4"
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=TramLower11";
+ location = "TramLower10"
+ },
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/mob/living/simple_animal/bot/secbot/beepsky/officer,
+/turf/open/floor/iron,
+/area/station/maintenance/tram/right)
"vHa" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -60567,6 +60579,11 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
+"vJK" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/left)
"vJN" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -60579,12 +60596,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"vJU" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/cable,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/center)
"vKb" = (
/obj/structure/lattice,
/obj/machinery/camera/motion{
@@ -60761,6 +60772,12 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
+"vNr" = (
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"vNu" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
@@ -60911,6 +60928,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"vQe" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/structure/holosign/barrier/atmos/tram,
+/obj/structure/fluff/tram_rail/floor{
+ dir = 1
+ },
+/turf/open/floor/vault{
+ base_icon_state = "tram2";
+ icon_state = "tram2";
+ desc = "A sturdy looking tram platform.";
+ name = "tram platform"
+ },
+/area/station/hallway/primary/tram/left)
"vQz" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -61130,6 +61160,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/port/central)
+"vTO" = (
+/obj/structure/chair/sofa{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"vTP" = (
/turf/open/misc/asteroid,
/area/station/science/genetics)
@@ -61260,6 +61297,13 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
+"vVR" = (
+/obj/structure/chair/sofa/left{
+ dir = 8
+ },
+/obj/structure/sign/clock/directional/east,
+/turf/open/floor/carpet,
+/area/station/medical/psychology)
"vVY" = (
/obj/structure/fluff/tram_rail{
dir = 1
@@ -61926,10 +61970,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"wjR" = (
-/obj/effect/landmark/tram/left_part,
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/left)
"wjT" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
@@ -62208,9 +62248,6 @@
"wpK" = (
/turf/closed/wall,
/area/station/science/lobby)
-"wpP" = (
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/left)
"wqu" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
@@ -62903,11 +62940,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
/area/station/engineering/main)
-"wCR" = (
-/obj/effect/turf_decal/trimline/white/tram,
-/obj/machinery/crossing_signal/northwest,
-/turf/open/floor/iron,
-/area/station/hallway/primary/tram/right)
"wDa" = (
/turf/open/floor/iron/white,
/area/station/security/medical)
@@ -63106,23 +63138,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"wGF" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/structure/disposalpipe/trunk/multiz{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"wGQ" = (
/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/iron/dark/smooth_edge{
@@ -63638,11 +63653,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"wQO" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/fluff/tram_rail/floor,
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/right)
"wQP" = (
/turf/closed/wall,
/area/station/maintenance/starboard/lesser)
@@ -63863,12 +63873,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"wVw" = (
-/obj/structure/fluff/tram_rail/floor{
- dir = 1
- },
-/turf/open/floor/glass/reinforced/tram,
-/area/station/hallway/primary/tram/left)
"wVE" = (
/obj/effect/turf_decal/trimline/yellow/warning,
/obj/effect/decal/cleanable/dirt,
@@ -63917,14 +63921,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"wWn" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/noslip/tram_plate,
-/area/station/hallway/primary/tram/left)
"wWo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64792,14 +64788,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"xiZ" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/chair/sofa/right,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"xjr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65980,6 +65968,9 @@
/obj/structure/window/reinforced/spawner/west,
/turf/open/floor/grass,
/area/station/science/genetics)
+"xGS" = (
+/turf/open/floor/glass/reinforced/tram,
+/area/station/hallway/primary/tram/center)
"xGX" = (
/obj/effect/turf_decal/siding/thinplating/corner{
dir = 8
@@ -66115,16 +66106,6 @@
/obj/machinery/vending/wallmed/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"xKm" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/chair/sofa{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"xKs" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -66198,6 +66179,15 @@
/obj/machinery/vending/coffee,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
+"xLG" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/noslip/tram_plate,
+/area/station/hallway/primary/tram/left)
"xLK" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 5
@@ -67325,6 +67315,16 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"ygL" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"ygM" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -99137,7 +99137,7 @@ fiv
iRL
ewM
iRL
-jgk
+qtS
fLL
rbs
cWZ
@@ -99185,7 +99185,7 @@ qaL
wph
roB
roB
-iXc
+cGI
mqw
aiQ
xBD
@@ -99389,7 +99389,7 @@ dyC
fIl
nUP
gvC
-ugb
+hXL
dQt
iRL
ewM
@@ -99900,7 +99900,7 @@ wRO
ykN
aiz
mCR
-pPN
+aON
nUP
cQY
kDd
@@ -102775,7 +102775,7 @@ bia
hZr
gdJ
hRj
-oux
+hAP
mwK
xtu
beG
@@ -106399,7 +106399,7 @@ lEI
saj
shF
tnj
-oZh
+jeW
jMo
fLW
kHt
@@ -112020,7 +112020,7 @@ mxV
lJn
sdf
jMD
-scY
+daz
ppM
nbq
iyC
@@ -112276,8 +112276,8 @@ oys
yky
lhA
oTm
-obR
-bvm
+fjE
+ijO
qig
bnS
rGx
@@ -112493,10 +112493,10 @@ dhe
dhe
dhe
unl
-xiZ
+gsI
nTG
nTG
-taK
+ygL
unl
qaV
kDi
@@ -112750,10 +112750,10 @@ dhe
dhe
dhe
unl
-flZ
-xKm
-xKm
-qal
+cQL
+boZ
+boZ
+pif
unl
gxw
kDi
@@ -113273,7 +113273,7 @@ bMX
kDi
fel
rVT
-wGF
+vns
vle
dif
fJS
@@ -113552,7 +113552,7 @@ bEn
bEn
bEn
bEn
-eVi
+vGR
mbJ
qxm
xtu
@@ -114913,7 +114913,7 @@ xrV
bhD
gzg
nfz
-asf
+gKs
byF
waj
vkq
@@ -116131,7 +116131,7 @@ qxm
tTp
oys
pTM
-deW
+muz
aYI
rvr
gdG
@@ -151586,7 +151586,7 @@ iuD
kXR
cFs
nzh
-eMH
+vfC
dIB
cFs
uab
@@ -151843,7 +151843,7 @@ iuD
kXR
cFs
lNP
-wpP
+dPb
vVY
cFs
uab
@@ -152100,7 +152100,7 @@ aed
agX
cFs
lNP
-wpP
+dPb
vVY
cFs
cfW
@@ -152357,7 +152357,7 @@ mUw
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -152614,7 +152614,7 @@ kTD
uVP
cFs
bEt
-wpP
+dPb
rib
cFs
ncN
@@ -152871,7 +152871,7 @@ qwg
ncN
cFs
lNP
-wpP
+dPb
vVY
cFs
ncN
@@ -153084,11 +153084,11 @@ cCc
mUl
tXi
mkz
-hUj
+csj
qYb
ycK
etH
-bLT
+jDa
hvZ
mGN
gNK
@@ -153128,7 +153128,7 @@ uQI
aII
cFs
lNP
-wjR
+moD
vVY
cFs
aMD
@@ -153385,7 +153385,7 @@ qwg
ncN
cFs
lNP
-wpP
+dPb
vVY
cFs
ncN
@@ -153642,7 +153642,7 @@ qwg
ncN
cFs
bEt
-wpP
+dPb
rib
cFs
emP
@@ -153887,7 +153887,7 @@ qhj
kzy
xyl
pxi
-iaZ
+qfi
rCn
urm
rMk
@@ -153899,7 +153899,7 @@ mwP
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -154156,7 +154156,7 @@ coK
cSJ
cFs
lNP
-wpP
+dPb
vVY
cFs
npG
@@ -154413,7 +154413,7 @@ iuD
kXR
cFs
lNP
-wpP
+dPb
vVY
cFs
uab
@@ -154670,7 +154670,7 @@ iuD
kXR
cFs
lNP
-wpP
+dPb
vVY
cFs
uab
@@ -154925,11 +154925,11 @@ gNS
dpo
hLJ
wpk
-tep
-iMR
-wWn
-wVw
-tep
+lId
+fjK
+iBo
+vwT
+lId
fVp
lNW
mAP
@@ -155182,11 +155182,11 @@ yiM
jUu
xwC
eNO
-asv
-iCz
-qoE
-uIC
-asv
+vJK
+ixx
+xLG
+jza
+vJK
eOr
aKp
sTs
@@ -155441,7 +155441,7 @@ yiM
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -155698,7 +155698,7 @@ ikn
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -155955,7 +155955,7 @@ tkv
yiM
cFs
bEt
-wpP
+dPb
rib
cFs
yiM
@@ -156212,7 +156212,7 @@ yiM
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -156469,7 +156469,7 @@ wPH
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -156726,7 +156726,7 @@ qBH
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -156983,7 +156983,7 @@ yiM
yiM
cFs
lNP
-wpP
+dPb
vVY
cFs
yiM
@@ -157240,7 +157240,7 @@ yiM
tAq
cFs
lNP
-wpP
+dPb
vVY
cFs
jYK
@@ -157497,7 +157497,7 @@ klT
cFs
cFs
lNP
-wpP
+dPb
vVY
cFs
cFs
@@ -157754,7 +157754,7 @@ klT
cFs
cFs
bEt
-wpP
+dPb
rib
cFs
cFs
@@ -158011,7 +158011,7 @@ klT
cFs
cFs
lNP
-wpP
+dPb
vVY
cFs
cFs
@@ -158268,7 +158268,7 @@ klT
cFs
cFs
lNP
-wpP
+dPb
vVY
cFs
cFs
@@ -158525,7 +158525,7 @@ yiM
tAq
cFs
lNP
-wpP
+dPb
vVY
cFs
jYK
@@ -158779,13 +158779,13 @@ dDG
dDG
dOi
klT
-eMv
-eMv
-lzb
-fbM
-uWq
-eMv
-pOk
+iUz
+iUz
+bvL
+uir
+vQe
+iUz
+dMO
klT
aRN
dDG
@@ -159036,13 +159036,13 @@ dDG
dDG
dOi
klT
-tep
-tep
-iMR
-wpP
-wVw
-tep
-tep
+lId
+lId
+fjK
+dPb
+vwT
+lId
+lId
klT
aRN
dDG
@@ -159293,13 +159293,13 @@ dDG
dDG
dOi
pdW
-pOx
-icF
-dnD
-obb
-bDm
-icF
-icF
+nwb
+xGS
+ftK
+uTb
+vNr
+xGS
+xGS
pdW
aRN
dDG
@@ -159550,13 +159550,13 @@ cuX
dDG
dOi
pdW
-irc
-irc
-vFg
-dns
-jar
-irc
-sIX
+iRU
+iRU
+oGP
+vvm
+mYv
+iRU
+ckX
pdW
aRN
dDG
@@ -159810,7 +159810,7 @@ izU
uCm
eSz
tCl
-obb
+uTb
wvE
eSz
poh
@@ -160067,7 +160067,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -160324,7 +160324,7 @@ pdW
eSz
eSz
leJ
-obb
+uTb
fpQ
eSz
eSz
@@ -160581,7 +160581,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -160838,7 +160838,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -161095,7 +161095,7 @@ izU
uCm
eSz
tCl
-obb
+uTb
wvE
eSz
poh
@@ -161352,7 +161352,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -161609,7 +161609,7 @@ mXu
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -161866,7 +161866,7 @@ mtE
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -162123,7 +162123,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -162380,7 +162380,7 @@ seG
izU
eSz
leJ
-obb
+uTb
fpQ
eSz
izU
@@ -162409,7 +162409,7 @@ kce
whz
xtu
mBq
-pwe
+ijJ
ojQ
iTS
gYg
@@ -162637,7 +162637,7 @@ uoH
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -162894,7 +162894,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -163149,11 +163149,11 @@ eSz
kQF
tGW
jJw
-kYX
-vJU
-eGA
-jJM
-kYX
+qku
+rgM
+tnc
+lFY
+qku
hke
lNj
dVP
@@ -163405,13 +163405,13 @@ eSz
eSz
wYe
aEM
-rhW
-icF
-dnD
-bdr
-bDm
-icF
-ttS
+nBf
+xGS
+ftK
+cti
+vNr
+xGS
+kdx
npC
dTr
xzq
@@ -163665,7 +163665,7 @@ aEM
cRU
eSz
tCl
-obb
+uTb
wvE
eSz
lyv
@@ -163922,7 +163922,7 @@ aEM
cRU
cmw
xXi
-aBv
+iEV
xDg
cmw
lyv
@@ -164179,7 +164179,7 @@ wHs
gej
nbS
hQn
-qia
+eiB
jcZ
nbS
sqz
@@ -164436,7 +164436,7 @@ bqI
izU
cEt
cPS
-qia
+eiB
jcZ
cEt
izU
@@ -164693,7 +164693,7 @@ bip
dtC
liQ
rPU
-qia
+eiB
biX
ucQ
wFw
@@ -164950,7 +164950,7 @@ bip
wFw
cQq
rPU
-mXp
+aKv
biX
mRi
pZm
@@ -165195,7 +165195,7 @@ nKz
ucE
aKB
vnI
-eZs
+gIK
nKz
crT
wcv
@@ -165207,7 +165207,7 @@ vjl
fld
cEt
kpB
-oph
+dHq
iJU
cEt
jEO
@@ -165464,7 +165464,7 @@ bip
wFw
liQ
rPU
-sjd
+jvN
biX
ucQ
wFw
@@ -165693,7 +165693,7 @@ dhe
dhe
eSx
eSx
-hpI
+aNL
pcP
omc
rpZ
@@ -165721,7 +165721,7 @@ bip
wFw
cQq
rPU
-qia
+eiB
biX
mRi
pWK
@@ -165978,7 +165978,7 @@ kBX
izU
cEt
cPS
-qia
+eiB
xof
cEt
izU
@@ -166235,7 +166235,7 @@ waf
odj
nbS
qDb
-qia
+eiB
tpa
nbS
kXK
@@ -166492,7 +166492,7 @@ dUC
cRU
cmw
xXi
-aBv
+iEV
spf
cmw
lyv
@@ -166749,7 +166749,7 @@ pdi
bQX
eSz
tCl
-obb
+uTb
wvE
eSz
lyv
@@ -167004,11 +167004,11 @@ eSz
wCn
loz
lhM
-icF
-dnD
-nnF
-bDm
-icF
+xGS
+ftK
+jQH
+vNr
+xGS
mzX
ris
vMl
@@ -167261,11 +167261,11 @@ eSz
rMA
fmf
bxy
-kYX
-vJU
-bwZ
-jJM
-kYX
+qku
+rgM
+suw
+lFY
+qku
ipd
vbL
gMZ
@@ -167520,7 +167520,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -167777,7 +167777,7 @@ mSn
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -168034,7 +168034,7 @@ seG
izU
eSz
leJ
-obb
+uTb
fpQ
eSz
izU
@@ -168291,7 +168291,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -168548,7 +168548,7 @@ mtE
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -168805,7 +168805,7 @@ mva
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -168824,9 +168824,9 @@ dvK
bLQ
bFq
qgd
-gnI
-ngS
-mTe
+jpZ
+vTO
+vVR
kcZ
ugt
pbn
@@ -169062,7 +169062,7 @@ izU
izU
eSz
tCl
-obb
+uTb
wvE
eSz
izU
@@ -169319,7 +169319,7 @@ izU
uCm
eSz
tCl
-obb
+uTb
wvE
eSz
poh
@@ -169576,7 +169576,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -169833,7 +169833,7 @@ pdW
eSz
eSz
leJ
-obb
+uTb
fpQ
eSz
eSz
@@ -170090,7 +170090,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -170347,7 +170347,7 @@ pdW
eSz
eSz
tCl
-obb
+uTb
wvE
eSz
eSz
@@ -170604,7 +170604,7 @@ izU
uCm
eSz
tCl
-obb
+uTb
wvE
eSz
poh
@@ -170858,13 +170858,13 @@ dhe
dDG
dOi
pdW
-irc
-irc
-vFg
-dns
-jar
-irc
-rPi
+iRU
+iRU
+oGP
+vvm
+mYv
+iRU
+bPz
pdW
aRN
dDG
@@ -171115,13 +171115,13 @@ dhe
dDG
dOi
pdW
-icF
-icF
-dnD
-obb
-bDm
-icF
-pOx
+xGS
+xGS
+ftK
+uTb
+vNr
+xGS
+nwb
pdW
aRN
dDG
@@ -171372,13 +171372,13 @@ dhe
dDG
dOi
pev
-kvz
-kvz
-jGX
-sRW
-uji
-kvz
-kvz
+aeZ
+aeZ
+aKe
+eaN
+lSm
+aeZ
+aeZ
pev
aRN
dDG
@@ -171629,13 +171629,13 @@ dhe
dDG
dOi
pev
-iDt
-iDt
-iZG
-uZg
-npL
-iDt
-ody
+hvX
+hvX
+hay
+pIS
+nIV
+hvX
+jgV
pev
aRN
dDG
@@ -171889,7 +171889,7 @@ bMb
qgo
brm
iOd
-sRW
+eaN
vPi
brm
dIo
@@ -172146,7 +172146,7 @@ pev
brm
brm
iOd
-sRW
+eaN
vPi
brm
brm
@@ -172403,7 +172403,7 @@ pev
brm
brm
iOd
-sRW
+eaN
vPi
brm
brm
@@ -172660,7 +172660,7 @@ pev
brm
brm
puY
-sRW
+eaN
bTT
brm
brm
@@ -172917,7 +172917,7 @@ pev
brm
brm
iOd
-sRW
+eaN
vPi
brm
brm
@@ -173174,7 +173174,7 @@ bMb
qgo
brm
iOd
-sRW
+eaN
vPi
brm
dIo
@@ -173431,7 +173431,7 @@ bMb
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -173688,7 +173688,7 @@ vMB
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -173945,7 +173945,7 @@ hFF
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -174202,7 +174202,7 @@ bMb
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -174459,7 +174459,7 @@ cEC
bMb
brm
puY
-sRW
+eaN
bTT
brm
bMb
@@ -174716,7 +174716,7 @@ ciF
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -174973,7 +174973,7 @@ bMb
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -175228,11 +175228,11 @@ wkz
xHd
xPU
nXJ
-kZb
-wQO
-oSW
-ezQ
-kZb
+rGS
+idp
+bmg
+kTc
+rGS
qsl
aNP
czl
@@ -175484,13 +175484,13 @@ whL
vUE
kkz
eLe
-wCR
-kvz
-jGX
-ayQ
-uji
-kvz
-dEo
+arH
+aeZ
+aKe
+fBy
+lSm
+aeZ
+cnN
kie
xas
uxN
@@ -175744,7 +175744,7 @@ eLe
era
brm
iOd
-sRW
+eaN
vPi
brm
kGR
@@ -176001,7 +176001,7 @@ eLe
era
brm
iOd
-sRW
+eaN
vPi
brm
kGR
@@ -176258,7 +176258,7 @@ lGp
kIT
brm
iOd
-sRW
+eaN
vPi
brm
gGi
@@ -176515,7 +176515,7 @@ mXX
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -176772,7 +176772,7 @@ wqX
jlA
brm
puY
-sRW
+eaN
bTT
brm
sFq
@@ -177029,7 +177029,7 @@ koh
sFq
brm
iOd
-sRW
+eaN
vPi
brm
sFq
@@ -177286,7 +177286,7 @@ jvd
dCf
brm
iOd
-vEa
+hbC
vPi
brm
nwQ
@@ -177543,7 +177543,7 @@ lHZ
sFq
brm
iOd
-sRW
+eaN
vPi
brm
sFq
@@ -177800,7 +177800,7 @@ lHZ
sFq
brm
puY
-sRW
+eaN
bTT
brm
swb
@@ -178057,7 +178057,7 @@ gKM
bMb
brm
iOd
-sRW
+eaN
vPi
brm
bMb
@@ -178314,7 +178314,7 @@ sPC
hYb
brm
iOd
-sRW
+eaN
vPi
brm
krO
@@ -178571,7 +178571,7 @@ eFy
era
brm
iOd
-sRW
+eaN
vPi
brm
kGR
@@ -178828,7 +178828,7 @@ ycY
era
brm
mWR
-uff
+cjQ
qQX
brm
kGR
@@ -180392,13 +180392,13 @@ wMn
bKU
iqZ
hvJ
-bFw
+phT
nzE
bHS
hQf
vme
ioo
-sKS
+dWy
xNT
etm
sQi
@@ -180649,13 +180649,13 @@ aVE
pLf
btO
hvJ
-ogy
-uAL
+vcB
+gov
bHS
hQf
vme
-uAL
-rvu
+gov
+aRY
xNT
pQd
pQd
@@ -181166,8 +181166,8 @@ hvJ
xNT
jLF
lzu
-cam
-hnT
+qLy
+pUA
jYx
xNT
dhe
@@ -181424,7 +181424,7 @@ vTP
bhp
tpN
vTP
-oJj
+mjl
bPf
vTP
dhe
diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm
index 622cc84134e..1f879efb01e 100644
--- a/code/__DEFINES/ai.dm
+++ b/code/__DEFINES/ai.dm
@@ -165,6 +165,7 @@
#define BB_DOG_PLAYING_DEAD "BB_DOG_PLAYING_DEAD"
#define BB_DOG_HARASS_TARGET "BB_DOG_HARASS_TARGET"
#define BB_DOG_HARASS_FRUSTRATION "BB_DOG_HARASS_FRUSTRATION"
+#define BB_DOG_IS_SLOW "BB_DOG_IS_SLOW"
/// Basically, what is our vision/hearing range for picking up on things to fetch/
#define AI_DOG_VISION_RANGE 10
@@ -222,6 +223,14 @@
///list of foods this mob likes
#define BB_BASIC_FOODS "BB_basic_foods"
+///Baby-making blackboard
+///Types of animal we can make babies with.
+#define BB_BABIES_PARTNER_TYPES "BB_babies_partner"
+///Types of animal that we make as a baby.
+#define BB_BABIES_CHILD_TYPES "BB_babies_child"
+///Current partner target
+#define BB_BABIES_TARGET "BB_babies_target"
+
///Bileworm AI keys
#define BB_BILEWORM_SPEW_BILE "BB_bileworm_spew_bile"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
index 2a2ea576470..954d2a8a24e 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
@@ -40,6 +40,8 @@
#define COMSIG_LIVING_TRY_SYRINGE "living_try_syringe"
///From living/Life(). (deltatime, times_fired)
#define COMSIG_LIVING_LIFE "living_life"
+///From living/set_resting(): (new_resting, silent, instant)
+#define COMSIG_LIVING_RESTING "living_resting"
///from base of element/bane/activate(): (item/weapon, mob/user)
#define COMSIG_LIVING_BANED "living_baned"
@@ -47,6 +49,10 @@
///from base of mob/living/death(): (gibbed)
#define COMSIG_LIVING_DEATH "living_death"
+///from base of mob/living/gib(): (no_brain, no_organs, no_bodyparts)
+///Note that it is fired regardless of whether the mob was dead beforehand or not.
+#define COMSIG_LIVING_GIBBED "living_gibbed"
+
///from base of mob/living/Write_Memory(): (dead, gibbed)
#define COMSIG_LIVING_WRITE_MEMORY "living_write_memory"
#define COMPONENT_DONT_WRITE_MEMORY (1<<0)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index bdf5bc585ee..d7d8e919ca5 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -148,9 +148,9 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
#define iscat(A) (istype(A, /mob/living/simple_animal/pet/cat))
-#define isdog(A) (istype(A, /mob/living/simple_animal/pet/dog))
+#define isdog(A) (istype(A, /mob/living/basic/pet/dog))
-#define iscorgi(A) (istype(A, /mob/living/simple_animal/pet/dog/corgi))
+#define iscorgi(A) (istype(A, /mob/living/basic/pet/dog/corgi))
#define ishostile(A) (istype(A, /mob/living/simple_animal/hostile))
diff --git a/code/__DEFINES/strippable.dm b/code/__DEFINES/strippable.dm
index a660e827842..9988861dbf9 100644
--- a/code/__DEFINES/strippable.dm
+++ b/code/__DEFINES/strippable.dm
@@ -18,7 +18,7 @@
#define STRIPPABLE_ITEM_RHAND "right_hand"
#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
-#define STRIPPABLE_ITEM_CORGI_COLLAR "corgi_collar"
+#define STRIPPABLE_ITEM_PET_COLLAR "pet_collar"
#define STRIPPABLE_ITEM_PARROT_HEADSET "parrot_headset"
/// This slot is not obscured.
diff --git a/code/datums/ai/babies/babies_behaviors.dm b/code/datums/ai/babies/babies_behaviors.dm
new file mode 100644
index 00000000000..c1269001e9b
--- /dev/null
+++ b/code/datums/ai/babies/babies_behaviors.dm
@@ -0,0 +1,77 @@
+/**
+ * Find a compatible, living partner, if we're also alone.
+ */
+/datum/ai_behavior/find_partner
+ action_cooldown = 40 SECONDS
+
+ /// Range to look.
+ var/range = 7
+
+ /// Maximum number of children
+ var/max_children = 3
+
+/datum/ai_behavior/find_partner/perform(delta_time, datum/ai_controller/controller, target_key, partner_types_key, child_types_key)
+ . = ..()
+
+ var/mob/pawn_mob = controller.pawn
+ var/list/partner_types = controller.blackboard[partner_types_key]
+ var/list/child_types = controller.blackboard[child_types_key]
+
+ var/mob/living/partner
+ var/children = 0
+ for(var/mob/other in oview(range, pawn_mob))
+ if(other.stat != CONSCIOUS) //Check if it's conscious FIRST.
+ continue
+ var/is_child = is_type_in_list(other, child_types)
+ if(is_child) //Check for children SECOND.
+ children++
+ else if(is_type_in_list(other, partner_types))
+ if(other.ckey)
+ continue
+ else if(!is_child && other.gender == MALE && !(other.flags_1 & HOLOGRAM_1)) //Better safe than sorry ;_;
+ partner = other
+
+ //shyness check. we're not shy in front of things that share a faction with us.
+ else if(isliving(other) && !pawn_mob.faction_check_mob(other))
+ finish_action(controller, FALSE)
+ return
+
+ if(partner && children < max_children)
+ controller.blackboard[target_key] = WEAKREF(partner)
+
+ finish_action(controller, TRUE)
+
+/**
+ * Reproduce.
+ */
+/datum/ai_behavior/make_babies
+ action_cooldown = 40 SECONDS
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+
+/datum/ai_behavior/make_babies/setup(datum/ai_controller/controller, target_key, child_types_key)
+ var/datum/weakref/weak_target = controller.blackboard[target_key]
+ var/atom/target = weak_target?.resolve()
+ if(!target)
+ return FALSE
+ controller.current_movement_target = target
+ return TRUE
+
+/datum/ai_behavior/make_babies/perform(delta_time, datum/ai_controller/controller, target_key, child_types_key)
+ . = ..()
+ var/datum/weakref/weak_target = controller.blackboard[target_key]
+ var/mob/target = weak_target?.resolve()
+ if(!target || target.stat != CONSCIOUS)
+ finish_action(controller, FALSE, target_key)
+ return
+
+ var/child_type = pick_weight(controller.blackboard[child_types_key])
+ var/turf/turf_loc = get_turf(controller.pawn.loc)
+ if(turf_loc)
+ new child_type(turf_loc)
+
+ finish_action(controller, TRUE, target_key)
+
+/datum/ai_behavior/make_babies/finish_action(datum/ai_controller/controller, succeeded, target_key)
+ . = ..()
+
+ controller.blackboard -= target_key
diff --git a/code/datums/ai/babies/babies_subtrees.dm b/code/datums/ai/babies/babies_subtrees.dm
new file mode 100644
index 00000000000..8095ca3a49e
--- /dev/null
+++ b/code/datums/ai/babies/babies_subtrees.dm
@@ -0,0 +1,34 @@
+/**
+ * Reproduce with a similar mob.
+ */
+/datum/ai_planning_subtree/make_babies
+ var/chance = 5
+
+/datum/ai_planning_subtree/make_babies/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+
+ if(controller.pawn.gender != FEMALE || !DT_PROB(chance, delta_time))
+ return
+
+ var/partner_types = controller.blackboard[BB_BABIES_PARTNER_TYPES]
+ var/baby_types = controller.blackboard[BB_BABIES_CHILD_TYPES]
+
+ if(!partner_types || !baby_types)
+ return
+
+ // Baby can't reproduce
+ if(is_type_in_list(controller.pawn, baby_types))
+ return
+
+ var/datum/weakref/weak_target = controller.blackboard[BB_BABIES_TARGET]
+ var/atom/target = weak_target?.resolve()
+
+ // Find target
+ if(!target || QDELETED(target))
+ controller.queue_behavior(/datum/ai_behavior/find_partner, BB_BABIES_TARGET, BB_BABIES_PARTNER_TYPES, BB_BABIES_CHILD_TYPES)
+ return
+
+ // Do target
+ if(target)
+ controller.queue_behavior(/datum/ai_behavior/make_babies, BB_BABIES_TARGET, BB_BABIES_CHILD_TYPES)
+ return SUBTREE_RETURN_FINISH_PLANNING
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm
index c0aaacfce3e..0ade512ca2b 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm
@@ -89,3 +89,16 @@
/datum/ai_planning_subtree/random_speech/cow/wisdom/New()
. = ..()
speak = GLOB.wisdoms //Done here so it's setup properly
+
+/datum/ai_planning_subtree/random_speech/dog
+ speech_chance = 1
+
+/datum/ai_planning_subtree/random_speech/dog/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ if(!isdog(controller.pawn))
+ return
+
+ // Stay in sync with dog fashion.
+ var/mob/living/basic/pet/dog/dog_pawn = controller.pawn
+ dog_pawn.update_dog_speech(src)
+
+ return ..()
diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm
index bfb31511d2d..84e9f621a27 100644
--- a/code/datums/ai/dog/dog_controller.dm
+++ b/code/datums/ai/dog/dog_controller.dm
@@ -1,17 +1,22 @@
/datum/ai_controller/dog
- blackboard = list(\
- BB_SIMPLE_CARRY_ITEM = null,\
- BB_FETCH_TARGET = null,\
- BB_FETCH_DELIVER_TO = null,\
- BB_DOG_FRIENDS = list(),\
- BB_FETCH_IGNORE_LIST = list(),\
- BB_DOG_ORDER_MODE = DOG_COMMAND_NONE,\
- BB_DOG_PLAYING_DEAD = FALSE,\
- BB_DOG_HARASS_TARGET = null,\
- BB_DOG_HARASS_FRUSTRATION = null,\
- BB_VISION_RANGE = AI_DOG_VISION_RANGE)
+ blackboard = list(
+ BB_SIMPLE_CARRY_ITEM = null,
+ BB_FETCH_TARGET = null,
+ BB_FETCH_DELIVER_TO = null,
+ BB_DOG_FRIENDS = list(),
+ BB_FETCH_IGNORE_LIST = list(),
+ BB_DOG_ORDER_MODE = DOG_COMMAND_NONE,
+ BB_DOG_PLAYING_DEAD = FALSE,
+ BB_DOG_HARASS_TARGET = null,
+ BB_DOG_HARASS_FRUSTRATION = null,
+ BB_VISION_RANGE = AI_DOG_VISION_RANGE,
+ )
ai_movement = /datum/ai_movement/jps
- planning_subtrees = list(/datum/ai_planning_subtree/dog)
+ idle_behavior = /datum/idle_behavior/idle_dog
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/dog,
+ /datum/ai_planning_subtree/dog,
+ )
COOLDOWN_DECLARE(heel_cooldown)
COOLDOWN_DECLARE(command_cooldown)
@@ -51,13 +56,6 @@
return FALSE
return ..()
-/datum/ai_controller/dog/get_access()
- var/mob/living/simple_animal/simple_pawn = pawn
- if(!istype(simple_pawn))
- return
-
- return simple_pawn.access_card
-
/// Someone has thrown something, see if it's someone we care about and start listening to the thrown item so we can see if we want to fetch it when it lands
/datum/ai_controller/dog/proc/listened_throw(datum/source, mob/living/carbon/carbon_thrower)
SIGNAL_HANDLER
@@ -285,3 +283,37 @@
if(living_pawn.buckled)
queue_behavior(/datum/ai_behavior/resist)//in case they are in bed or something
queue_behavior(/datum/ai_behavior/harass)
+
+
+/**
+ * Same thing but with make tiny corgis and use access cards.
+ */
+/datum/ai_controller/dog/corgi
+ blackboard = list(
+ BB_SIMPLE_CARRY_ITEM = null,
+ BB_FETCH_TARGET = null,
+ BB_FETCH_DELIVER_TO = null,
+ BB_DOG_FRIENDS = list(),
+ BB_FETCH_IGNORE_LIST = list(),
+ BB_DOG_ORDER_MODE = DOG_COMMAND_NONE,
+ BB_DOG_PLAYING_DEAD = FALSE,
+ BB_DOG_HARASS_TARGET = null,
+ BB_DOG_HARASS_FRUSTRATION = null,
+ BB_VISION_RANGE = AI_DOG_VISION_RANGE,
+
+ BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/dog),
+ BB_BABIES_CHILD_TYPES = list(/mob/living/basic/pet/dog/corgi/puppy = 95, /mob/living/basic/pet/dog/corgi/puppy/void = 5),
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/dog,
+ /datum/ai_planning_subtree/make_babies,
+ /datum/ai_planning_subtree/dog,
+ )
+
+/datum/ai_controller/dog/corgi/get_access()
+ var/mob/living/basic/pet/dog/corgi/corgi_pawn = pawn
+ if(!istype(corgi_pawn))
+ return
+
+ return corgi_pawn.access_card
diff --git a/code/datums/ai/idle_behaviors/idle_dog.dm b/code/datums/ai/idle_behaviors/idle_dog.dm
index fd27bc6968e..96396aa8af9 100644
--- a/code/datums/ai/idle_behaviors/idle_dog.dm
+++ b/code/datums/ai/idle_behaviors/idle_dog.dm
@@ -13,9 +13,12 @@
var/obj/item/carry_item = controller.blackboard[BB_SIMPLE_CARRY_ITEM]
living_pawn.visible_message(span_notice("[living_pawn] gently teethes on \the [carry_item] in [living_pawn.p_their()] mouth."), vision_distance=COMBAT_MESSAGE_RANGE)
- if(DT_PROB(5, delta_time) && (living_pawn.mobility_flags & MOBILITY_MOVE))
+ // Custom movement rate, for old corgis, etc.
+ var/move_chance = controller.blackboard[BB_DOG_IS_SLOW] ? 2.5 : 5
+
+ if(DT_PROB(move_chance, delta_time) && (living_pawn.mobility_flags & MOBILITY_MOVE))
var/move_dir = pick(GLOB.alldirs)
living_pawn.Move(get_step(living_pawn, move_dir), move_dir)
- else if(DT_PROB(10, delta_time))
- living_pawn.manual_emote(pick("dances around.","chases [living_pawn.p_their()] tail!"))
+ else if(DT_PROB(2, delta_time))
+ living_pawn.manual_emote(pick("dances around.", "chases [living_pawn.p_their()] tail!"))
living_pawn.AddComponent(/datum/component/spinny)
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index 96a9cfaaea3..3ac45f41584 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -170,7 +170,7 @@
for(var/mob/M in oview(owner, 7))
if(!isliving(M)) //ghosts ain't people
continue
- if((istype(M, /mob/living/simple_animal/pet)) || M.ckey)
+ if(istype(M, /mob/living/simple_animal/pet) || istype(M, /mob/living/basic/pet) || M.ckey)
return FALSE
return TRUE
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index e2ff48e770c..a561b5e6675 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST_INIT(creamable, typecacheof(list(
/mob/living/carbon/human,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
/mob/living/silicon/ai)))
/**
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index fb8d07550c2..4d6d0031e06 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -268,7 +268,7 @@
stage3 = list("Must... eat... chocolate....", "YAP")
stage4 = list("Visions of washing machines assail your mind!")
stage5 = list("AUUUUUU!!!")
- new_form = /mob/living/simple_animal/pet/dog/corgi
+ new_form = /mob/living/basic/pet/dog/corgi
/datum/disease/transformation/corgi/stage_act(delta_time, times_fired)
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 267c7f2354a..7daffcfc204 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -17,20 +17,22 @@
name = replacetext(name, "REAL_NAME", M.real_name)
desc = replacetext(desc, "NAME", name)
-/datum/dog_fashion/proc/apply(mob/living/simple_animal/pet/dog/D)
+/datum/dog_fashion/proc/apply(mob/living/basic/pet/dog/D)
if(name)
D.name = name
if(desc)
D.desc = desc
- if(emote_see)
- D.emote_see = string_list(emote_see)
- if(emote_hear)
- D.emote_hear = string_list(emote_hear)
- if(speak)
- D.speak = string_list(speak)
if(speak_emote)
D.speak_emote = string_list(speak_emote)
+/datum/dog_fashion/proc/apply_to_speech(datum/ai_planning_subtree/random_speech/speech)
+ if(emote_see)
+ speech.emote_see = string_list(emote_see)
+ if(emote_hear)
+ speech.emote_hear = string_list(emote_hear)
+ if(speak)
+ speech.speak = string_list(speak)
+
/datum/dog_fashion/proc/get_overlay(dir)
if(icon_file && obj_icon_state)
var/image/corgI = image(icon_file, obj_icon_state, dir = dir)
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index dc8abc62a56..dfbbf150c26 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -377,7 +377,7 @@
nonhuman_mobtype = /mob/living/simple_animal/hostile/gorilla
/datum/preset_holoimage/corgi
- nonhuman_mobtype = /mob/living/simple_animal/pet/dog/corgi
+ nonhuman_mobtype = /mob/living/basic/pet/dog/corgi
/datum/preset_holoimage/clown
outfit_type = /datum/outfit/job/clown
diff --git a/code/datums/memory/memory.dm b/code/datums/memory/memory.dm
index f9a8129c4ab..a77e82d280b 100644
--- a/code/datums/memory/memory.dm
+++ b/code/datums/memory/memory.dm
@@ -66,9 +66,9 @@
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/parrot,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
/mob/living/simple_animal/crab,
- /mob/living/simple_animal/pet/dog/pug,
+ /mob/living/basic/pet/dog/pug,
/mob/living/simple_animal/pet/cat,
/mob/living/basic/mouse,
/mob/living/simple_animal/chicken,
@@ -77,7 +77,7 @@
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat/cak,
- /mob/living/simple_animal/pet/dog/breaddog,
+ /mob/living/basic/pet/dog/breaddog,
/mob/living/simple_animal/chick,
/mob/living/basic/cow/wisdom,
/obj/item/skub,
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index 60d5cc7ac0c..2c678f062e6 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -43,8 +43,8 @@
report_message = "Ian has gone exploring somewhere in the station."
/datum/station_trait/ian_adventure/on_round_start()
- for(var/mob/living/simple_animal/pet/dog/corgi/dog in GLOB.mob_list)
- if(!(istype(dog, /mob/living/simple_animal/pet/dog/corgi/ian) || istype(dog, /mob/living/simple_animal/pet/dog/corgi/puppy/ian)))
+ for(var/mob/living/basic/pet/dog/corgi/dog in GLOB.mob_list)
+ if(!(istype(dog, /mob/living/basic/pet/dog/corgi/ian) || istype(dog, /mob/living/basic/pet/dog/corgi/puppy/ian)))
continue
// Makes this station trait more interesting. Ian probably won't go anywhere without a little external help.
@@ -64,7 +64,7 @@
do_smoke(location=adventure_turf)
/// Moves the new dog somewhere safe, equips it with the old one's inventory and makes it deadchat_playable.
-/datum/station_trait/ian_adventure/proc/do_corgi_respawn(mob/living/simple_animal/pet/dog/corgi/old_dog, mob/living/simple_animal/pet/dog/corgi/new_dog, gibbed, lives_left)
+/datum/station_trait/ian_adventure/proc/do_corgi_respawn(mob/living/basic/pet/dog/corgi/old_dog, mob/living/basic/pet/dog/corgi/new_dog, gibbed, lives_left)
SIGNAL_HANDLER
var/turf/current_turf = get_turf(new_dog)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 4bf2ec315f5..c4b664d6248 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -276,6 +276,10 @@ GLOBAL_LIST_INIT(dye_registry, list(
investigate_log("has been gibbed by a washing machine.", INVESTIGATE_DEATHS)
gib()
+/mob/living/basic/pet/machine_wash(obj/machinery/washing_machine/washer)
+ washer.bloody_mess = TRUE
+ gib()
+
/obj/item/machine_wash(obj/machinery/washing_machine/washer)
if(washer.color_source)
dye_item(washer.color_source.dye_color)
@@ -369,7 +373,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
if(L.buckled || L.has_buckled_mobs())
return
if(state_open)
- if(istype(L, /mob/living/simple_animal/pet))
+ if(istype(L, /mob/living/simple_animal/pet) || istype(L, /mob/living/basic/pet))
L.forceMove(src)
update_appearance()
return
diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm
index ffb3223ea17..86dd2bac70b 100644
--- a/code/game/objects/effects/spawners/gibspawner.dm
+++ b/code/game/objects/effects/spawners/gibspawner.dm
@@ -69,7 +69,7 @@
return ..()
/obj/effect/gibspawner/generic/animal
- gib_mob_type = /mob/living/simple_animal/pet
+ gib_mob_type = /mob/living/basic/pet
diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm
index ec8e8ebc8c5..0f06f25f8e5 100644
--- a/code/game/objects/structures/petrified_statue.dm
+++ b/code/game/objects/structures/petrified_statue.dm
@@ -98,7 +98,7 @@
S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
return TRUE
-/mob/living/simple_animal/pet/dog/corgi/petrify(statue_timer)
+/mob/living/basic/pet/dog/corgi/petrify(statue_timer)
if(!isturf(loc))
return FALSE
var/obj/structure/statue/petrified/S = new (loc, src, statue_timer)
diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
index f723b8e788c..a35a1a21f16 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
@@ -12,7 +12,7 @@
possible_shapes = list(
/mob/living/basic/mouse,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
/mob/living/simple_animal/hostile/carp,
/mob/living/simple_animal/bot/secbot,
/mob/living/simple_animal/pet/fox,
diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm
index 6dd27e541c3..f62a823d1c4 100644
--- a/code/modules/antagonists/traitor/objectives/kill_pet.dm
+++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm
@@ -19,8 +19,8 @@
/// Possible heads mapped to their pet type. Can be a list of possible pets
var/list/possible_heads = list(
JOB_HEAD_OF_PERSONNEL = list(
- /mob/living/simple_animal/pet/dog/corgi/ian,
- /mob/living/simple_animal/pet/dog/corgi/puppy/ian
+ /mob/living/basic/pet/dog/corgi/ian,
+ /mob/living/basic/pet/dog/corgi/puppy/ian
),
JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault,
JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime,
@@ -57,7 +57,7 @@
/mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus
),
JOB_WARDEN = list(
- /mob/living/simple_animal/pet/dog/pug/mcgriff
+ /mob/living/basic/pet/dog/pug/mcgriff
)
)
diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm
index f91dfcb01a8..a1f6b33930b 100644
--- a/code/modules/cargo/packs/livestock.dm
+++ b/code/modules/cargo/packs/livestock.dm
@@ -61,7 +61,7 @@
one dog from the millions of Ian's noble bloodline. Comes with a cute collar!"
cost = CARGO_CRATE_VALUE * 10
access_view = ACCESS_HOP
- contains = list(/mob/living/simple_animal/pet/dog/corgi,
+ contains = list(/mob/living/basic/pet/dog/corgi,
/obj/item/clothing/neck/petcollar,
)
crate_name = "corgi crate"
@@ -69,10 +69,10 @@
/datum/supply_pack/critter/corgi/generate()
. = ..()
if(prob(50))
- var/mob/living/simple_animal/pet/dog/corgi/D = locate() in .
+ var/mob/living/basic/pet/dog/corgi/D = locate() in .
if(D.gender == FEMALE)
qdel(D)
- new /mob/living/simple_animal/pet/dog/corgi/lisa(.)
+ new /mob/living/basic/pet/dog/corgi/lisa(.)
/datum/supply_pack/critter/cow
name = "Cow Crate"
@@ -123,7 +123,7 @@
desc = "Corgi fit for a king, this corgi comes in a unique color to signify their superiority. \
Comes with a cute collar!"
cost = CARGO_CRATE_VALUE * 11
- contains = list(/mob/living/simple_animal/pet/dog/corgi/exoticcorgi,
+ contains = list(/mob/living/basic/pet/dog/corgi/exoticcorgi,
/obj/item/clothing/neck/petcollar,
)
crate_name = "exotic corgi crate"
@@ -166,7 +166,7 @@
name = "Pug Crate"
desc = "Like a normal dog, but... squished. Contains one pug. Comes with a nice collar!"
cost = CARGO_CRATE_VALUE * 10
- contains = list(/mob/living/simple_animal/pet/dog/pug,
+ contains = list(/mob/living/basic/pet/dog/pug,
/obj/item/clothing/neck/petcollar,
)
crate_name = "pug crate"
@@ -176,7 +176,7 @@
desc = "Like a normal dog, but with a head the shape of an egg. Contains one bull terrier. \
Comes with a nice collar!"
cost = CARGO_CRATE_VALUE * 10
- contains = list(/mob/living/simple_animal/pet/dog/bullterrier,
+ contains = list(/mob/living/basic/pet/dog/bullterrier,
/obj/item/clothing/neck/petcollar,
)
crate_name = "bull terrier crate"
diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm
index 4c4ea1ff22d..a26a787ff84 100644
--- a/code/modules/events/ghost_role/sentience.dm
+++ b/code/modules/events/ghost_role/sentience.dm
@@ -1,4 +1,5 @@
GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
+ /mob/living/basic/pet,
/mob/living/simple_animal/pet,
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/hostile/lizard,
diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index abb7a69daf2..b0b9aa35264 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -16,7 +16,7 @@
if(b)
new /obj/item/storage/spooky(b)
- for(var/mob/living/simple_animal/pet/dog/corgi/ian/Ian in GLOB.mob_living_list)
+ for(var/mob/living/basic/pet/dog/corgi/ian/Ian in GLOB.mob_living_list)
Ian.place_on_head(new /obj/item/bedsheet(Ian))
for(var/mob/living/simple_animal/parrot/poly/Poly in GLOB.mob_living_list)
new /mob/living/simple_animal/parrot/poly/ghost(Poly.loc)
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index 455543d45b8..31ebe744833 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -39,7 +39,7 @@
description = "We need to see how the body functions from the earliest moments. Some cytology experiments will help us gain this understanding."
total_requirement = 3
max_requirement_per_type = 2
- possible_types = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/retaliate/snake, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/corgi, /mob/living/basic/cow, /mob/living/simple_animal/chicken)
+ possible_types = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/retaliate/snake, /mob/living/simple_animal/pet/cat, /mob/living/basic/pet/dog/corgi, /mob/living/basic/cow, /mob/living/simple_animal/chicken)
/datum/experiment/scanning/random/cytology/medium/one
name = "Advanced Cytology Scanning Experiment One"
diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm
index eac77fddb60..9518337f266 100644
--- a/code/modules/explorer_drone/loot.dm
+++ b/code/modules/explorer_drone/loot.dm
@@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index())
/datum/adventure_loot_generator/pet
id = "pets"
var/carrier_type = /obj/item/pet_carrier/biopod
- var/list/possible_pets = list(/mob/living/simple_animal/pet/cat/space,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/pet/penguin/baby,/mob/living/simple_animal/pet/dog/pug)
+ var/list/possible_pets = list(/mob/living/simple_animal/pet/cat/space,/mob/living/basic/pet/dog/corgi,/mob/living/simple_animal/pet/penguin/baby,/mob/living/basic/pet/dog/pug)
/datum/adventure_loot_generator/pet/generate()
var/obj/item/pet_carrier/carrier = new carrier_type()
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
index ed39ff22140..688eee0bfb7 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
@@ -142,7 +142,7 @@
/datum/reagent/blood = 30,
/datum/reagent/teslium = 1 //To shock the whole thing into life
)
- result = /mob/living/simple_animal/pet/dog/breaddog
+ result = /mob/living/basic/pet/dog/breaddog
subcategory = CAT_BREAD
////////////////////////////////////////////////TOAST////////////////////////////////////////////////
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index bdcbcdb3743..03703099b6a 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -758,7 +758,7 @@
for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
Monitor.icon_state_on = "entertainment_xmas"
- for(var/mob/living/simple_animal/pet/dog/corgi/ian/Ian in GLOB.mob_living_list)
+ for(var/mob/living/basic/pet/dog/corgi/ian/Ian in GLOB.mob_living_list)
Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
index f8deccea4f3..4d14fc929cf 100644
--- a/code/modules/holodeck/holo_effect.dm
+++ b/code/modules/holodeck/holo_effect.dm
@@ -88,9 +88,9 @@
/mob/living/basic/rabbit,
)
mobtype += pick(
- /mob/living/simple_animal/pet/dog/corgi,
- /mob/living/simple_animal/pet/dog/corgi/puppy,
- /mob/living/simple_animal/pet/dog/pug,
+ /mob/living/basic/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi/puppy,
+ /mob/living/basic/pet/dog/pug,
)
mobtype += pick(
/mob/living/simple_animal/pet/cat,
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 14ef7beddd2..ae079f432ad 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -83,7 +83,7 @@
/datum/job/head_of_personnel/get_mail_goodies(mob/recipient)
. = ..()
// Strange Reagent if the pet is dead.
- for(var/mob/living/simple_animal/pet/dog/corgi/ian/staff_pet in GLOB.dead_mob_list)
+ for(var/mob/living/basic/pet/dog/corgi/ian/staff_pet in GLOB.dead_mob_list)
. += list(/datum/reagent/medicine/strange_reagent = 20)
break
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/basic/pets/dog.dm
similarity index 73%
rename from code/modules/mob/living/simple_animal/friendly/dog.dm
rename to code/modules/mob/living/basic/pets/dog.dm
index 0ea412bf918..71f6c4a5e00 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/basic/pets/dog.dm
@@ -1,6 +1,6 @@
//Dogs.
-/mob/living/simple_animal/pet/dog
+/mob/living/basic/pet/dog
mob_biotypes = MOB_ORGANIC|MOB_BEAST
response_help_continuous = "pets"
response_help_simple = "pet"
@@ -8,33 +8,30 @@
response_disarm_simple = "bop"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
speak_emote = list("barks", "woofs")
- emote_hear = list("barks!", "woofs!", "yaps.","pants.")
- emote_see = list("shakes their head.", "chases their tail.","shivers.")
faction = list("neutral")
see_in_dark = 5
- speak_chance = 1
- turns_per_move = 10
can_be_held = TRUE
ai_controller = /datum/ai_controller/dog
- stop_automated_movement = TRUE
///In the case 'melee_damage_upper' is somehow raised above 0
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
- footstep_type = FOOTSTEP_MOB_CLAW
-
-/mob/living/simple_animal/pet/dog/Initialize(mapload)
+/mob/living/basic/pet/dog/Initialize(mapload)
. = ..()
AddElement(/datum/element/pet_bonus, "woofs happily!")
- add_cell_sample()
+ AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
+
+/mob/living/basic/pet/dog/proc/update_dog_speech(datum/ai_planning_subtree/random_speech/speech)
+ speech.speak = string_list(list("YAP", "Woof!", "Bark!", "AUUUUUU"))
+ speech.emote_hear = string_list(list("barks!", "woofs!", "yaps.","pants."))
+ speech.emote_see = string_list(list("shakes [p_their()] head.", "chases [p_their()] tail.","shivers."))
//Corgis and pugs are now under one dog subtype
-/mob/living/simple_animal/pet/dog/corgi
+/mob/living/basic/pet/dog/corgi
name = "\improper corgi"
real_name = "corgi"
desc = "They're a corgi."
@@ -43,35 +40,39 @@
icon_dead = "corgi_dead"
held_state = "corgi"
butcher_results = list(/obj/item/food/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
- childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
- animal_species = /mob/living/simple_animal/pet/dog
gold_core_spawnable = FRIENDLY_SPAWN
- collar_type = "corgi"
+ collar_icon_state = "corgi"
+ ai_controller = /datum/ai_controller/dog/corgi
var/obj/item/inventory_head
var/obj/item/inventory_back
+ /// Access card for Ian.
+ var/obj/item/card/id/access_card = null
var/shaved = FALSE
var/nofur = FALSE //Corgis that have risen past the material plane of existence.
+ /// Is this corgi physically slow due to age, etc?
+ var/is_slow = FALSE
-/mob/living/simple_animal/pet/dog/corgi/add_cell_sample()
- AddElement(/datum/element/swabable, CELL_LINE_TABLE_CORGI, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-
-/mob/living/simple_animal/pet/dog/corgi/Destroy()
+/mob/living/basic/pet/dog/corgi/Destroy()
QDEL_NULL(inventory_head)
QDEL_NULL(inventory_back)
+ QDEL_NULL(access_card)
return ..()
-/mob/living/simple_animal/pet/dog/corgi/gib()
+/mob/living/basic/pet/dog/corgi/gib()
if(inventory_head)
inventory_head.forceMove(drop_location())
inventory_head = null
if(inventory_back)
inventory_back.forceMove(drop_location())
inventory_back = null
+ if(access_card)
+ access_card.forceMove(drop_location())
+ access_card = null
return ..()
-/mob/living/simple_animal/pet/dog/corgi/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS)
+/mob/living/basic/pet/dog/corgi/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS)
. = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(
- "speak" = CALLBACK(src, PROC_REF(handle_automated_speech), TRUE),
+ "speak" = CALLBACK(src, PROC_REF(bork)),
"wear_hat" = CALLBACK(src, PROC_REF(find_new_hat)),
"drop_hat" = CALLBACK(src, PROC_REF(drop_hat)),
"spin" = CALLBACK(src, TYPE_PROC_REF(/mob, emote), "spin")), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays)))
@@ -79,10 +80,17 @@
if(. == COMPONENT_INCOMPATIBLE)
return
- stop_automated_movement = TRUE
+ // Stop all automated behavior.
+ QDEL_NULL(ai_controller)
+
+///Deadchat bark.
+/mob/living/basic/pet/dog/corgi/proc/bork()
+ var/emote = pick("barks!", "woofs!", "yaps.","pants.")
+
+ manual_emote(emote)
///Deadchat plays command that picks a new hat for Ian.
-/mob/living/simple_animal/pet/dog/corgi/proc/find_new_hat()
+/mob/living/basic/pet/dog/corgi/proc/find_new_hat()
if(!isturf(loc))
return
var/list/possible_headwear = list()
@@ -102,7 +110,7 @@
visible_message(span_notice("[src] puts [inventory_head] on [p_their()] own head, somehow."))
///Deadchat plays command that drops the current hat off Ian.
-/mob/living/simple_animal/pet/dog/corgi/proc/drop_hat()
+/mob/living/basic/pet/dog/corgi/proc/drop_hat()
if(!inventory_head)
return
visible_message(span_notice("[src] vigorously shakes [p_their()] head, dropping [inventory_head] to the ground."))
@@ -111,7 +119,13 @@
update_corgi_fluff()
regenerate_icons()
-/mob/living/simple_animal/pet/dog/corgi/handle_atom_del(atom/A)
+///Turn AI back on.
+/mob/living/basic/pet/dog/corgi/proc/stop_deadchat_plays()
+ var/controller_type = initial(ai_controller)
+ ai_controller = new controller_type(src)
+ ai_controller?.blackboard[BB_DOG_IS_SLOW] = is_slow
+
+/mob/living/basic/pet/dog/corgi/handle_atom_del(atom/A)
if(A == inventory_head)
inventory_head = null
update_corgi_fluff()
@@ -122,7 +136,7 @@
regenerate_icons()
return ..()
-/mob/living/simple_animal/pet/dog/pug
+/mob/living/basic/pet/dog/pug
name = "\improper pug"
real_name = "pug"
desc = "They're a pug."
@@ -132,19 +146,21 @@
icon_dead = "pug_dead"
butcher_results = list(/obj/item/food/meat/slab/pug = 3)
gold_core_spawnable = FRIENDLY_SPAWN
- collar_type = "pug"
+ collar_icon_state = "pug"
held_state = "pug"
-/mob/living/simple_animal/pet/dog/pug/add_cell_sample()
+/mob/living/basic/pet/dog/pug/Initialize(mapload)
+ . = ..()
+
AddElement(/datum/element/swabable, CELL_LINE_TABLE_PUG, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-/mob/living/simple_animal/pet/dog/pug/mcgriff
+/mob/living/basic/pet/dog/pug/mcgriff
name = "McGriff"
desc = "This dog can tell something smells around here, and that something is CRIME!"
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
-/mob/living/simple_animal/pet/dog/bullterrier
+/mob/living/basic/pet/dog/bullterrier
name = "\improper bull terrier"
real_name = "bull terrier"
desc = "They're a bull terrier."
@@ -154,44 +170,53 @@
icon_dead = "bullterrier_dead"
butcher_results = list(/obj/item/food/meat/slab/corgi = 3) // Would feel redundant to add more new dog meats.
gold_core_spawnable = FRIENDLY_SPAWN
- collar_type = "bullterrier"
+ collar_icon_state = "bullterrier"
held_state = "bullterrier"
-/mob/living/simple_animal/pet/dog/corgi/exoticcorgi
+/mob/living/basic/pet/dog/corgi/exoticcorgi
name = "Exotic Corgi"
desc = "As cute as they are colorful!"
icon = 'icons/mob/simple/pets.dmi'
icon_state = "corgigrey"
icon_living = "corgigrey"
icon_dead = "corgigrey_dead"
- animal_species = /mob/living/simple_animal/pet/dog/corgi/exoticcorgi
nofur = TRUE
-/mob/living/simple_animal/pet/dog/Initialize(mapload)
+/mob/living/basic/pet/dog/Initialize(mapload)
. = ..()
var/dog_area = get_area(src)
for(var/obj/structure/bed/dogbed/D in dog_area)
if(D.update_owner(src)) //No muscling in on my turf you fucking parrot
break
-/mob/living/simple_animal/pet/dog/corgi/Initialize(mapload)
+/mob/living/basic/pet/dog/corgi/Initialize(mapload)
. = ..()
regenerate_icons()
AddElement(/datum/element/strippable, GLOB.strippable_corgi_items)
+ AddElement(/datum/element/swabable, CELL_LINE_TABLE_CORGI, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
+ RegisterSignal(src, COMSIG_MOB_TRIED_ACCESS, PROC_REF(on_tried_access))
-/mob/living/simple_animal/pet/dog/corgi/exoticcorgi/Initialize(mapload)
+/**
+ * Handler for COMSIG_MOB_TRIED_ACCESS
+ */
+/mob/living/basic/pet/dog/corgi/proc/on_tried_access(mob/accessor, obj/locked_thing)
+ SIGNAL_HANDLER
+
+ return locked_thing?.check_access(access_card) ? ACCESS_ALLOWED : ACCESS_DISALLOWED
+
+/mob/living/basic/pet/dog/corgi/exoticcorgi/Initialize(mapload)
. = ..()
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
-/mob/living/simple_animal/pet/dog/corgi/death(gibbed)
+/mob/living/basic/pet/dog/corgi/death(gibbed)
..(gibbed)
regenerate_icons()
GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
/datum/strippable_item/corgi_head,
/datum/strippable_item/corgi_back,
- /datum/strippable_item/corgi_collar,
+ /datum/strippable_item/pet_collar,
/datum/strippable_item/corgi_id,
)))
@@ -199,21 +224,21 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
key = STRIPPABLE_ITEM_HEAD
/datum/strippable_item/corgi_head/get_item(atom/source)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
return corgi_source.inventory_head
/datum/strippable_item/corgi_head/finish_equip(atom/source, obj/item/equipping, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
corgi_source.place_on_head(equipping, user)
/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -222,11 +247,47 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.update_corgi_fluff()
corgi_source.regenerate_icons()
+/datum/strippable_item/pet_collar
+ key = STRIPPABLE_ITEM_PET_COLLAR
+
+/datum/strippable_item/pet_collar/get_item(atom/source)
+ var/mob/living/basic/pet/pet_source = source
+ if (!istype(pet_source))
+ return
+
+ return pet_source.collar
+
+/datum/strippable_item/pet_collar/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ if (!istype(equipping, /obj/item/clothing/neck/petcollar))
+ to_chat(user, span_warning("That's not a collar."))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/pet_collar/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/basic/pet/pet_source = source
+ if (!istype(pet_source))
+ return
+
+ pet_source.add_collar(equipping, user)
+
+/datum/strippable_item/pet_collar/finish_unequip(atom/source, mob/user)
+ var/mob/living/basic/pet/pet_source = source
+ if (!istype(pet_source))
+ return
+
+ var/obj/collar = pet_source.remove_collar(user.drop_location())
+ user.put_in_hands(collar)
+
/datum/strippable_item/corgi_back
key = STRIPPABLE_ITEM_BACK
/datum/strippable_item/corgi_back/get_item(atom/source)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -249,7 +310,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
return TRUE
/datum/strippable_item/corgi_back/finish_equip(atom/source, obj/item/equipping, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -259,7 +320,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.regenerate_icons()
/datum/strippable_item/corgi_back/finish_unequip(atom/source, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -268,50 +329,11 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.update_corgi_fluff()
corgi_source.regenerate_icons()
-/datum/strippable_item/corgi_collar
- key = STRIPPABLE_ITEM_CORGI_COLLAR
-
-/datum/strippable_item/corgi_collar/get_item(atom/source)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
- if (!istype(corgi_source))
- return
-
- return corgi_source.pcollar
-
-/datum/strippable_item/corgi_collar/try_equip(atom/source, obj/item/equipping, mob/user)
- . = ..()
- if (!.)
- return FALSE
-
- if (!istype(equipping, /obj/item/clothing/neck/petcollar))
- to_chat(user, span_warning("That's not a collar."))
- return FALSE
-
- return TRUE
-
-/datum/strippable_item/corgi_collar/finish_equip(atom/source, obj/item/equipping, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
- if (!istype(corgi_source))
- return
-
- corgi_source.add_collar(equipping, user)
- corgi_source.update_corgi_fluff()
-
-/datum/strippable_item/corgi_collar/finish_unequip(atom/source, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
- if (!istype(corgi_source))
- return
-
- user.put_in_hands(corgi_source.pcollar)
- corgi_source.pcollar = null
- corgi_source.update_corgi_fluff()
- corgi_source.regenerate_icons()
-
/datum/strippable_item/corgi_id
key = STRIPPABLE_ITEM_ID
/datum/strippable_item/corgi_id/get_item(atom/source)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -329,7 +351,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
return TRUE
/datum/strippable_item/corgi_id/finish_equip(atom/source, obj/item/equipping, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -337,7 +359,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.access_card = equipping
/datum/strippable_item/corgi_id/finish_unequip(atom/source, mob/user)
- var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ var/mob/living/basic/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
@@ -346,7 +368,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.update_corgi_fluff()
corgi_source.regenerate_icons()
-/mob/living/simple_animal/pet/dog/corgi/getarmor(def_zone, type)
+/mob/living/basic/pet/dog/corgi/getarmor(def_zone, type)
var/armorval = 0
if(def_zone)
@@ -364,7 +386,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
armorval += inventory_back.armor.getRating(type)
return armorval*0.5
-/mob/living/simple_animal/pet/dog/corgi/attackby(obj/item/O, mob/user, params)
+/mob/living/basic/pet/dog/corgi/attackby(obj/item/O, mob/user, params)
if (istype(O, /obj/item/razor))
if (shaved)
to_chat(user, span_warning("You can't shave this corgi, [p_they()] has already been shaved!"))
@@ -392,7 +414,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
//Many hats added, Some will probably be removed, just want to see which ones are popular.
// > some will probably be removed
-/mob/living/simple_animal/pet/dog/corgi/proc/place_on_head(obj/item/item_to_add, mob/living/user)
+/mob/living/basic/pet/dog/corgi/proc/place_on_head(obj/item/item_to_add, mob/living/user)
if(inventory_head)
if(user)
to_chat(user, span_warning("You can't put more than one hat on [src]!"))
@@ -434,15 +456,12 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
return valid
-/mob/living/simple_animal/pet/dog/corgi/proc/update_corgi_fluff()
+/mob/living/basic/pet/dog/corgi/proc/update_corgi_fluff()
// First, change back to defaults
name = real_name
desc = initial(desc)
// BYOND/DM doesn't support the use of initial on lists.
- speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
speak_emote = list("barks", "woofs")
- emote_hear = list("barks!", "woofs!", "yaps.","pants.")
- emote_see = list("shakes [p_their()] head.", "chases [p_their()] tail.","shivers.")
desc = initial(desc)
set_light(0)
@@ -454,13 +473,23 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
var/datum/dog_fashion/DF = new inventory_back.dog_fashion(src)
DF.apply(src)
+/mob/living/basic/pet/dog/corgi/update_dog_speech(datum/ai_planning_subtree/random_speech/speech)
+ ..()
+
+ if(inventory_head?.dog_fashion)
+ var/datum/dog_fashion/DF = new inventory_head.dog_fashion(src)
+ DF.apply_to_speech(speech)
+
+ if(inventory_back?.dog_fashion)
+ var/datum/dog_fashion/DF = new inventory_back.dog_fashion(src)
+ DF.apply_to_speech(speech)
+
//IAN! SQUEEEEEEEEE~
-/mob/living/simple_animal/pet/dog/corgi/ian
+/mob/living/basic/pet/dog/corgi/ian
name = "Ian"
real_name = "Ian" //Intended to hold the name without altering it.
gender = MALE
desc = "He's the HoP's beloved corgi."
- icon = 'modular_skyrat/modules/chadian/icons/ian.dmi' //SKYRAT EDIT CHANGE
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "bops"
@@ -474,7 +503,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
var/memory_saved = FALSE
var/saved_head //path
-/mob/living/simple_animal/pet/dog/corgi/ian/Initialize(mapload)
+/mob/living/basic/pet/dog/corgi/ian/Initialize(mapload)
. = ..()
//parent call must happen first to ensure IAN
//is not in nullspace when child puppies spawn
@@ -482,7 +511,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
if(age == 0)
var/turf/target = get_turf(loc)
if(target)
- new /mob/living/simple_animal/pet/dog/corgi/puppy/ian(target)
+ new /mob/living/basic/pet/dog/corgi/puppy/ian(target)
Write_Memory(FALSE)
return INITIALIZE_HINT_QDEL
else if(age == record_age)
@@ -491,24 +520,21 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
held_state = "old_corgi"
icon_dead = "old_corgi_dead"
desc = "At a ripe old age of [record_age], Ian's not as spry as he used to be, but he'll always be the HoP's beloved corgi." //RIP
- turns_per_move = 20
+ ai_controller?.blackboard[BB_DOG_IS_SLOW] = TRUE
+ is_slow = TRUE
- old = TRUE //SKYRAT EDIT ADDITION
-
-/* SKYRAT EDIT REMOVAL
-/mob/living/simple_animal/pet/dog/corgi/ian/Life(delta_time = SSMOBS_DT, times_fired)
+/mob/living/basic/pet/dog/corgi/ian/Life(delta_time = SSMOBS_DT, times_fired)
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory(FALSE)
memory_saved = TRUE
..()
-*/
-/mob/living/simple_animal/pet/dog/corgi/ian/death()
+/mob/living/basic/pet/dog/corgi/ian/death()
if(!memory_saved)
Write_Memory(TRUE)
..()
-/mob/living/simple_animal/pet/dog/corgi/ian/proc/Read_Memory()
+/mob/living/basic/pet/dog/corgi/ian/proc/Read_Memory()
if(fexists("data/npc_saves/Ian.sav")) //legacy compatability to convert old format to new
var/savefile/S = new /savefile("data/npc_saves/Ian.sav")
S["age"] >> age
@@ -530,7 +556,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
if(saved_head)
place_on_head(new saved_head)
-/mob/living/simple_animal/pet/dog/corgi/ian/Write_Memory(dead, gibbed)
+/mob/living/basic/pet/dog/corgi/ian/Write_Memory(dead, gibbed)
. = ..()
if(!.)
return
@@ -553,14 +579,14 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
-/mob/living/simple_animal/pet/dog/corgi/ian/narsie_act()
+/mob/living/basic/pet/dog/corgi/ian/narsie_act()
playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE)
- var/mob/living/simple_animal/pet/dog/corgi/narsie/N = new(loc)
+ var/mob/living/basic/pet/dog/corgi/narsie/N = new(loc)
N.setDir(dir)
investigate_log("has been gibbed by Nar'Sie.", INVESTIGATE_DEATHS)
gib()
-/mob/living/simple_animal/pet/dog/corgi/narsie
+/mob/living/basic/pet/dog/corgi/narsie
name = "Nars-Ian"
desc = "Ia! Ia!"
icon_state = "narsian"
@@ -572,10 +598,17 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
unique_pet = TRUE
held_state = "narsian"
-/mob/living/simple_animal/pet/dog/corgi/narsie/Life(delta_time = SSMOBS_DT, times_fired)
+/mob/living/basic/pet/dog/corgi/narsie/Life(delta_time = SSMOBS_DT, times_fired)
..()
for(var/mob/living/simple_animal/pet/P in range(1, src))
- if(P != src && !istype(P,/mob/living/simple_animal/pet/dog/corgi/narsie))
+ if(P != src && !istype(P,/mob/living/basic/pet/dog/corgi/narsie))
+ visible_message(span_warning("[src] devours [P]!"), \
+ "DELICIOUS SOULS")
+ playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
+ narsie_act()
+ P.gib()
+ for(var/mob/living/basic/pet/P in range(1, src))
+ if(P != src && !istype(P,/mob/living/basic/pet/dog/corgi/narsie))
visible_message(span_warning("[src] devours [P]!"), \
"DELICIOUS SOULS")
playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
@@ -583,18 +616,20 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
P.investigate_log("has been gibbed by [src].", INVESTIGATE_DEATHS)
P.gib()
-/mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()
+/mob/living/basic/pet/dog/corgi/narsie/update_corgi_fluff()
..()
- speak = list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR")
speak_emote = list("growls", "barks ominously")
- emote_hear = list("barks echoingly!", "woofs hauntingly!", "yaps in an eldritch manner.", "mutters something unspeakable.")
- emote_see = list("communes with the unnameable.", "ponders devouring some souls.", "shakes.")
-/mob/living/simple_animal/pet/dog/corgi/narsie/narsie_act()
+/mob/living/basic/pet/dog/corgi/narsie/update_dog_speech(datum/ai_planning_subtree/random_speech/speech)
+ speech.speak = string_list(list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR"))
+ speech.emote_hear = string_list(list("barks echoingly!", "woofs hauntingly!", "yaps in an eldritch manner.", "mutters something unspeakable."))
+ speech.emote_see = string_list(list("communes with the unnameable.", "ponders devouring some souls.", "shakes."))
+
+/mob/living/basic/pet/dog/corgi/narsie/narsie_act()
adjustBruteLoss(-maxHealth)
-/mob/living/simple_animal/pet/dog/corgi/regenerate_icons()
+/mob/living/basic/pet/dog/corgi/regenerate_icons()
..()
if(inventory_head)
var/image/head_icon
@@ -639,7 +674,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
-/mob/living/simple_animal/pet/dog/corgi/puppy
+/mob/living/basic/pet/dog/corgi/puppy
name = "\improper corgi puppy"
real_name = "corgi"
desc = "They're a corgi puppy!"
@@ -649,24 +684,24 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
- collar_type = "puppy"
+ collar_icon_state = "puppy"
//puppies cannot wear anything.
-/mob/living/simple_animal/pet/dog/corgi/puppy/Topic(href, href_list)
+/mob/living/basic/pet/dog/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
to_chat(usr, span_warning("You can't fit this on [src], [p_they()] [p_are()] too small!"))
return
..()
//PUPPY IAN! SQUEEEEEEEEE~
-/mob/living/simple_animal/pet/dog/corgi/puppy/ian
+/mob/living/basic/pet/dog/corgi/puppy/ian
name = "Ian"
real_name = "Ian"
gender = MALE
desc = "He's the HoP's beloved corgi puppy."
-/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace
+/mob/living/basic/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace
name = "\improper void puppy"
real_name = "voidy"
desc = "A corgi puppy that has been infused with deep space energy. It's staring back..."
@@ -675,20 +710,20 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
icon_living = "void_puppy"
icon_dead = "void_puppy_dead"
nofur = TRUE
- unsuitable_atmos_damage = 0
- minbodytemp = TCMB
- maxbodytemp = T0C + 40
held_state = "void_puppy"
-/mob/living/simple_animal/pet/dog/corgi/puppy/void/Initialize(mapload)
+/mob/living/basic/pet/dog/corgi/puppy/void/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_AI_BAGATTACK, INNATE_TRAIT)
+ RemoveElement(/datum/element/atmos_requirements)
+ RemoveElement(/datum/element/basic_body_temp_sensitive)
+ AddElement(/datum/element/basic_body_temp_sensitive, TCMB, T0C + 40)
-/mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
+/mob/living/basic/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return 1 //Void puppies can navigate space.
//LISA! SQUEEEEEEEEE~
-/mob/living/simple_animal/pet/dog/corgi/lisa
+/mob/living/basic/pet/dog/corgi/lisa
name = "Lisa"
real_name = "Lisa"
gender = FEMALE
@@ -708,17 +743,13 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
var/puppies = 0
//Lisa already has a cute bow!
-/mob/living/simple_animal/pet/dog/corgi/lisa/Topic(href, href_list)
+/mob/living/basic/pet/dog/corgi/lisa/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
to_chat(usr, span_warning("[src] already has a cute bow!"))
return
..()
-/mob/living/simple_animal/pet/dog/corgi/lisa/Life(delta_time = SSMOBS_DT, times_fired)
- . = ..()
- make_babies()
-
-/mob/living/simple_animal/pet/dog/breaddog //Most of the code originates from Cak
+/mob/living/basic/pet/dog/breaddog //Most of the code originates from Cak
name = "Kobun"
desc = "It is a dog made out of bread. 'The universe is definitely half full'."
icon_state = "breaddog"
@@ -728,7 +759,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
health = 50
maxHealth = 50
gender = NEUTER
- harm_intent_damage = 10
+ damage_coeff = list(BRUTE = 3, BURN = 3, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
butcher_results = list(/obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, /obj/item/food/breadslice = 3, \
/obj/item/food/meat/slab = 2)
response_harm_continuous = "takes a bite out of"
@@ -737,10 +768,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
held_state = "breaddog"
worn_slot_flags = ITEM_SLOT_HEAD
-/mob/living/simple_animal/pet/dog/breaddog/add_cell_sample()
- return
-
-/mob/living/simple_animal/pet/dog/breaddog/CheckParts(list/parts)
+/mob/living/basic/pet/dog/breaddog/CheckParts(list/parts)
..()
var/obj/item/organ/internal/brain/candidate = locate(/obj/item/organ/internal/brain) in contents
if(!candidate || !candidate.brainmob || !candidate.brainmob.mind)
@@ -755,7 +783,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
to_chat(src, span_notice("Your name is now [new_name]!"))
name = new_name
-/mob/living/simple_animal/pet/dog/breaddog/Life(delta_time = SSMOBS_DT, times_fired)
+/mob/living/basic/pet/dog/breaddog/Life(delta_time = SSMOBS_DT, times_fired)
..()
if(stat)
return
@@ -766,7 +794,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
for(var/mob/living/carbon/humanoid_entities in view(3, src)) //Mood aura which stay as long you do not wear Sanallite as hat or carry(I will try to make it work with hat someday(obviously weaker than normal one))
humanoid_entities.add_mood_event("kobun", /datum/mood_event/kobun)
-/mob/living/simple_animal/pet/dog/breaddog/attack_hand(mob/living/user, list/modifiers)
+/mob/living/basic/pet/dog/breaddog/attack_hand(mob/living/user, list/modifiers)
..()
if(user.combat_mode && user.reagents && !stat)
user.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4)
diff --git a/code/modules/mob/living/basic/pets/pet.dm b/code/modules/mob/living/basic/pets/pet.dm
new file mode 100644
index 00000000000..ea8181628b3
--- /dev/null
+++ b/code/modules/mob/living/basic/pets/pet.dm
@@ -0,0 +1,150 @@
+/mob/living/basic/pet
+ icon = 'icons/mob/simple/pets.dmi'
+ mob_size = MOB_SIZE_SMALL
+ mob_biotypes = MOB_ORGANIC|MOB_BEAST
+ blood_volume = BLOOD_VOLUME_NORMAL
+
+ /// if the mob is protected from being renamed by collars.
+ var/unique_pet = FALSE
+ /// If the mob has collar sprites, this is the base of the icon states.
+ var/collar_icon_state = null
+ /// We have a seperate _rest collar icon state when the pet is resting.
+ var/has_collar_resting_icon_state = FALSE
+
+ /// Our collar
+ var/obj/item/clothing/neck/petcollar/collar
+
+/mob/living/basic/pet/Initialize(mapload)
+ . = ..()
+
+ // String assoc list returns a cached list, so this is like a static list to pass into the element below.
+ var/static/list/habitable_atmos = list(
+ "min_oxy" = 5,
+ "max_oxy" = 0,
+ "min_plas" = 0,
+ "max_plas" = 1,
+ "min_co2" = 0,
+ "max_co2" = 5,
+ "min_n2" = 0,
+ "max_n2" = 0,
+ )
+
+ AddElement(/datum/element/atmos_requirements, atmos_requirements = habitable_atmos, unsuitable_atmos_damage = 1)
+ AddElement(/datum/element/basic_body_temp_sensitive)
+
+ /// Can set the collar var beforehand to start the pet with a collar.
+ if(collar)
+ collar = new(src)
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/basic/pet/Destroy()
+ . = ..()
+
+ QDEL_NULL(collar)
+
+/mob/living/basic/pet/attackby(obj/item/thing, mob/user, params)
+ if(istype(thing, /obj/item/clothing/neck/petcollar) && !collar)
+ add_collar(thing, user)
+ return TRUE
+
+ if(istype(thing, /obj/item/newspaper) && !stat)
+ user.visible_message(span_notice("[user] baps [name] on the nose with the rolled up [thing]."))
+ dance_rotate(src)
+ return TRUE
+
+ return ..()
+
+/mob/living/basic/pet/update_overlays()
+ . = ..()
+
+ if(!collar || !collar_icon_state)
+ return
+
+ // Determine which status tag to add to the middle of the icon state.
+ var/dead_tag = stat == DEAD ? "_dead" : null
+ var/rest_tag = has_collar_resting_icon_state && resting ? "_rest" : null
+ var/stat_tag = dead_tag || rest_tag || ""
+
+ . += mutable_appearance(icon, "[collar_icon_state][stat_tag]collar")
+ . += mutable_appearance(icon, "[collar_icon_state][stat_tag]tag")
+
+/mob/living/basic/pet/gib()
+ . = ..()
+
+ remove_collar(drop_location(), update_visuals = FALSE)
+
+/mob/living/basic/pet/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
+ . = ..()
+ if(!.)
+ return
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/basic/pet/death(gibbed)
+ . = ..()
+ add_memory_in_range(src, 7, MEMORY_PET_DEAD, list(DETAIL_DEUTERAGONIST = src), story_value = STORY_VALUE_AMAZING, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF) //Protagonist is the person memorizing it
+
+/mob/living/basic/pet/handle_atom_del(atom/deleting_atom)
+ . = ..()
+
+ if(deleting_atom != collar)
+ return
+
+ collar = null
+
+ if(QDELETED(src))
+ return
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/basic/pet/update_stat()
+ . = ..()
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/basic/pet/set_resting(new_resting, silent, instant)
+ . = ..()
+
+ if(!has_collar_resting_icon_state)
+ return
+
+ update_icon(UPDATE_OVERLAYS)
+
+/**
+ * Add a collar to the pet.
+ *
+ * Arguments:
+ * * new_collar - the collar.
+ * * user - the user that did it.
+ */
+/mob/living/basic/pet/proc/add_collar(obj/item/clothing/neck/petcollar/new_collar, mob/user)
+ if(QDELETED(new_collar) || collar)
+ return
+ if(!user.transferItemToLoc(new_collar, src))
+ return
+
+ collar = new_collar
+ if(collar_icon_state)
+ update_icon(UPDATE_OVERLAYS)
+
+ to_chat(user, span_notice("You put [new_collar] around [src]'s neck."))
+ if(new_collar.tagname && !unique_pet)
+ fully_replace_character_name(null, "\proper [new_collar.tagname]")
+
+/**
+ * Remove the collar from the pet.
+ */
+/mob/living/basic/pet/proc/remove_collar(atom/new_loc, update_visuals = TRUE)
+ if(!collar)
+ return
+
+ var/obj/old_collar = collar
+
+ collar.forceMove(new_loc)
+ collar = null
+
+ if(collar_icon_state && update_visuals)
+ update_icon(UPDATE_OVERLAYS)
+
+ return old_collar
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 38f1e65bb78..cd4eaae32c3 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -20,6 +20,7 @@
spread_bodyparts(no_brain, no_organs)
spawn_gibs(no_bodyparts)
+ SEND_SIGNAL(src, COMSIG_LIVING_GIBBED, no_brain, no_organs, no_bodyparts)
qdel(src)
/mob/living/proc/gib_animation()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 32a6df92040..90b43d08097 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -615,6 +615,7 @@
to_chat(src, "You stand up.")*/
get_up(instant)
+ SEND_SIGNAL(src, COMSIG_LIVING_RESTING, new_resting, silent, instant)
update_resting()
@@ -1423,9 +1424,9 @@
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/parrot,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
/mob/living/simple_animal/crab,
- /mob/living/simple_animal/pet/dog/pug,
+ /mob/living/basic/pet/dog/pug,
/mob/living/simple_animal/pet/cat,
/mob/living/basic/mouse,
/mob/living/simple_animal/chicken,
@@ -1434,7 +1435,7 @@
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat/cak,
- /mob/living/simple_animal/pet/dog/breaddog,
+ /mob/living/basic/pet/dog/breaddog,
/mob/living/simple_animal/chick,
)
new_mob = new picked_animal(loc)
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 7f3545f9ae7..8dab8456ded 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -31,7 +31,8 @@
mobility_flags = MOBILITY_FLAGS_REST_CAPABLE_DEFAULT
var/mob/living/basic/mouse/movement_target
gold_core_spawnable = FRIENDLY_SPAWN
- collar_type = "cat"
+ collar_icon_state = "cat"
+ has_collar_resting_icon_state = TRUE
can_be_held = TRUE
held_state = "cat2"
///only for attacking rats
@@ -72,7 +73,7 @@
icon_state = "breadcat"
icon_living = "breadcat"
icon_dead = "breadcat_dead"
- collar_type = null
+ collar_icon_state = null
held_state = "breadcat"
butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/organ/internal/ears/cat = 1, /obj/item/organ/external/tail/cat = 1, /obj/item/food/breadslice/plain = 1)
@@ -86,12 +87,13 @@
icon_state = "original"
icon_living = "original"
icon_dead = "original_dead"
- collar_type = null
+ collar_icon_state = null
unique_pet = TRUE
held_state = "original"
/mob/living/simple_animal/pet/cat/original/add_cell_sample()
return
+
/mob/living/simple_animal/pet/cat/kitten
name = "kitten"
desc = "D'aaawwww."
@@ -101,7 +103,7 @@
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
- collar_type = "kitten"
+ collar_icon_state = "kitten"
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/runtime
@@ -199,11 +201,8 @@
return
if (resting)
icon_state = "[icon_living]_rest"
- collar_type = "[initial(collar_type)]_rest"
else
icon_state = "[icon_living]"
- collar_type = "[initial(collar_type)]"
- regenerate_icons()
/mob/living/simple_animal/pet/cat/Life(delta_time = SSMOBS_DT, times_fired)
@@ -215,7 +214,7 @@
manual_emote(pick("sits down.", "crouches on [p_their()] hind legs.", "looks alert."))
set_resting(TRUE)
icon_state = "[icon_living]_sit"
- collar_type = "[initial(collar_type)]_sit"
+ cut_overlays() // No collar support in sitting state
else if(DT_PROB(0.5, delta_time))
if (resting)
manual_emote(pick("gets up and meows.", "walks around.", "stops resting."))
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 0506f991ca8..31ff9067fd1 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -63,10 +63,6 @@
/mob/living/simple_animal/pet/gondola/can_speak(allow_mimes = FALSE)
return FALSE // Gondolas are the silent walker.
-/// Special handling for gondolas, as they don't use icon_states and instead rely on overlays. The parent of this proc deletes all our overlays, so we're overriding it.
-/mob/living/simple_animal/pet/gondola/regenerate_icons()
- return
-
#undef GONDOLA_HEIGHT
#undef GONDOLA_COLOR
#undef GONDOLA_MOUSTACHE
diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 592d411786a..58b1d13ab01 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -3,77 +3,138 @@
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST
blood_volume = BLOOD_VOLUME_NORMAL
- var/unique_pet = FALSE // if the mob can be renamed
- var/obj/item/clothing/neck/petcollar/pcollar
- var/collar_type //if the mob has collar sprites, define them.
-/mob/living/simple_animal/pet/handle_atom_del(atom/A)
- if(A == pcollar)
- pcollar = null
- return ..()
+ /// if the mob is protected from being renamed by collars.
+ var/unique_pet = FALSE
+ /// If the mob has collar sprites, this is the base of the icon states.
+ var/collar_icon_state
+ /// We have a seperate _rest collar icon state when the pet is resting.
+ var/has_collar_resting_icon_state = FALSE
-/mob/living/simple_animal/pet/proc/add_collar(obj/item/clothing/neck/petcollar/P, mob/user)
- if(QDELETED(P) || pcollar)
- return
- if(!user.transferItemToLoc(P, src))
- return
- pcollar = P
- regenerate_icons()
- to_chat(user, span_notice("You put the [P] around [src]'s neck."))
- if(P.tagname && !unique_pet)
- fully_replace_character_name(null, "\proper [P.tagname]")
-
-/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
- add_collar(O, user)
- return
-
- if(istype(O, /obj/item/newspaper))
- if(!stat)
- user.visible_message(span_notice("[user] baps [name] on the nose with the rolled up [O]."))
- dance_rotate(src)
- else
- ..()
+ /// Our collar
+ var/obj/item/clothing/neck/petcollar/collar
/mob/living/simple_animal/pet/Initialize(mapload)
. = ..()
- if(pcollar)
- pcollar = new(src)
- regenerate_icons()
+
+ /// Can set the collar var beforehand to start the pet with a collar.
+ if(collar)
+ collar = new(src)
+
+ update_icon(UPDATE_OVERLAYS)
/mob/living/simple_animal/pet/Destroy()
- QDEL_NULL(pcollar)
+ . = ..()
+
+ QDEL_NULL(collar)
QDEL_NULL(access_card)
+
+/mob/living/simple_animal/pet/attackby(obj/item/thing, mob/user, params)
+ if(istype(thing, /obj/item/clothing/neck/petcollar) && !collar)
+ add_collar(thing, user)
+ return TRUE
+
+ if(istype(thing, /obj/item/newspaper) && !stat)
+ user.visible_message(span_notice("[user] baps [name] on the nose with the rolled up [thing]."))
+ dance_rotate(src)
+ return TRUE
+
return ..()
+/mob/living/simple_animal/pet/update_overlays()
+ . = ..()
+
+ if(!collar || !collar_icon_state)
+ return
+
+ // Determine which status tag to add to the middle of the icon state.
+ var/dead_tag = stat == DEAD ? "_dead" : null
+ var/rest_tag = has_collar_resting_icon_state && resting ? "_rest" : null
+ var/stat_tag = dead_tag || rest_tag || ""
+
+ . += mutable_appearance(icon, "[collar_icon_state][stat_tag]collar")
+ . += mutable_appearance(icon, "[collar_icon_state][stat_tag]tag")
+
/mob/living/simple_animal/pet/gib()
- if(pcollar)
- pcollar.forceMove(drop_location())
- pcollar = null
+ . = ..()
+
if(access_card)
access_card.forceMove(drop_location())
access_card = null
- return ..()
+
+ remove_collar(drop_location(), update_visuals = FALSE)
/mob/living/simple_animal/pet/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
. = ..()
if(!.)
return
- if(collar_type)
- collar_type = "[initial(collar_type)]"
- regenerate_icons()
+ update_icon(UPDATE_OVERLAYS)
/mob/living/simple_animal/pet/death(gibbed)
. = ..()
- if(collar_type)
- collar_type = "[initial(collar_type)]_dead"
- regenerate_icons()
-
add_memory_in_range(src, 7, MEMORY_PET_DEAD, list(DETAIL_DEUTERAGONIST = src), story_value = STORY_VALUE_AMAZING, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF) //Protagonist is the person memorizing it
-/mob/living/simple_animal/pet/regenerate_icons()
- cut_overlays()
- if(pcollar && collar_type)
- add_overlay("[collar_type]collar")
- add_overlay("[collar_type]tag")
+/mob/living/simple_animal/pet/handle_atom_del(atom/deleting_atom)
+ . = ..()
+
+ if(deleting_atom != collar)
+ return
+
+ collar = null
+
+ if(QDELETED(src))
+ return
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/simple_animal/pet/update_stat()
+ . = ..()
+
+ update_icon(UPDATE_OVERLAYS)
+
+/mob/living/simple_animal/pet/set_resting(new_resting, silent, instant)
+ . = ..()
+
+ if(!has_collar_resting_icon_state)
+ return
+
+ update_icon(UPDATE_OVERLAYS)
+
+/**
+ * Add a collar to the pet.
+ *
+ * Arguments:
+ * * new_collar - the collar.
+ * * user - the user that did it.
+ */
+/mob/living/simple_animal/pet/proc/add_collar(obj/item/clothing/neck/petcollar/new_collar, mob/user)
+ if(QDELETED(new_collar) || collar)
+ return
+ if(!user.transferItemToLoc(new_collar, src))
+ return
+
+ collar = new_collar
+ if(collar_icon_state)
+ update_icon(UPDATE_OVERLAYS)
+
+ to_chat(user, span_notice("You put [new_collar] around [src]'s neck."))
+ if(new_collar.tagname && !unique_pet)
+ fully_replace_character_name(null, "\proper [new_collar.tagname]")
+
+/**
+ * Remove the collar from the pet.
+ */
+/mob/living/simple_animal/pet/proc/remove_collar(atom/new_loc, update_visuals = TRUE)
+ if(!collar)
+ return
+
+ var/obj/old_collar = collar
+
+ collar.forceMove(new_loc)
+ collar = null
+
+ if(collar_icon_state && update_visuals)
+ update_icon(UPDATE_OVERLAYS)
+
+ return old_collar
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 634597cf0b1..b8102bb60ce 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -264,7 +264,7 @@
for(var/t in bodyparts) //this really should not be necessary
qdel(t)
- var/mob/living/simple_animal/pet/dog/corgi/new_corgi = new /mob/living/simple_animal/pet/dog/corgi (loc)
+ var/mob/living/basic/pet/dog/corgi/new_corgi = new /mob/living/basic/pet/dog/corgi (loc)
new_corgi.set_combat_mode(TRUE)
new_corgi.key = key
@@ -368,7 +368,7 @@
//Good mobs!
if(ispath(MP, /mob/living/simple_animal/pet/cat))
return TRUE
- if(ispath(MP, /mob/living/simple_animal/pet/dog/corgi))
+ if(ispath(MP, /mob/living/basic/pet/dog/corgi))
return TRUE
if(ispath(MP, /mob/living/simple_animal/crab))
return TRUE
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index fbcd3ff18fd..b4348215dd5 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -562,7 +562,7 @@
/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in rand(1, created_volume) to created_volume) // More lulz.
- new /mob/living/simple_animal/pet/dog/corgi(location)
+ new /mob/living/basic/pet/dog/corgi(location)
..()
//monkey powder heehoo
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 7dc4a9ab19c..a53bcb8af24 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -94,7 +94,7 @@
/obj/machinery/rnd/experimentor/Initialize(mapload)
. = ..()
- tracked_ian_ref = WEAKREF(locate(/mob/living/simple_animal/pet/dog/corgi/ian) in GLOB.mob_living_list)
+ tracked_ian_ref = WEAKREF(locate(/mob/living/basic/pet/dog/corgi/ian) in GLOB.mob_living_list)
tracked_runtime_ref = WEAKREF(locate(/mob/living/simple_animal/pet/cat/runtime) in GLOB.mob_living_list)
critical_items_typecache = typecacheof(list(
@@ -498,7 +498,7 @@
tracked_ian.forceMove(loc)
investigate_log("Experimentor has stolen Ian!", INVESTIGATE_EXPERIMENTOR) //...if anyone ever fixes it...
else
- new /mob/living/simple_animal/pet/dog/corgi(loc)
+ new /mob/living/basic/pet/dog/corgi(loc)
investigate_log("Experimentor has spawned a new corgi.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
if(globalMalf > 36 && globalMalf < 50)
@@ -616,8 +616,8 @@
/obj/item/relic/proc/corgicannon(mob/user)
playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user))
- C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throwSmoke), C))
+ var/mob/living/basic/pet/dog/corgi/sad_corgi = new(get_turf(user))
+ sad_corgi.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throwSmoke), sad_corgi))
warn_admins(user, "Corgi Cannon", 0)
/obj/item/relic/proc/clean(mob/user)
@@ -642,12 +642,12 @@
/mob/living/simple_animal/parrot/natural,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
+ /mob/living/basic/pet/dog/pug,
/mob/living/simple_animal/crab,
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/hostile/lizard,
/mob/living/basic/mouse,
- /mob/living/simple_animal/pet/dog/pug,
/mob/living/simple_animal/hostile/bear,
/mob/living/simple_animal/hostile/bee,
/mob/living/simple_animal/hostile/carp,
diff --git a/code/modules/research/xenobiology/crossbreeding/_mobs.dm b/code/modules/research/xenobiology/crossbreeding/_mobs.dm
index cbaabdf35d5..ecf18cd027d 100644
--- a/code/modules/research/xenobiology/crossbreeding/_mobs.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_mobs.dm
@@ -38,7 +38,7 @@ Slimecrossing Mobs
return
//Slime corgi - Chilling Pink
-/mob/living/simple_animal/pet/dog/corgi/puppy/slime
+/mob/living/basic/pet/dog/corgi/puppy/slime
name = "\improper slime corgi puppy"
real_name = "slime corgi puppy"
desc = "An unbearably cute pink slime corgi puppy."
@@ -48,5 +48,8 @@ Slimecrossing Mobs
nofur = TRUE
gold_core_spawnable = NO_SPAWN
speak_emote = list("blorbles", "bubbles", "borks")
- emote_hear = list("bubbles!", "splorts.", "splops!")
- emote_see = list("gets goop everywhere.", "flops.", "jiggles!")
+
+/mob/living/basic/pet/dog/corgi/puppy/slime/update_dog_speech(datum/ai_planning_subtree/random_speech/speech)
+ speech.speak = string_list(list())
+ speech.emote_hear = string_list(list("bubbles!", "splorts.", "splops!"))
+ speech.emote_see = string_list(list("gets goop everywhere.", "flops.", "jiggles!"))
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 378e4767bf1..18f5a2849ca 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -269,7 +269,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/pink/do_effect(mob/user)
user.visible_message(span_notice("[src] cracks like an egg, and an adorable puppy comes tumbling out!"))
- new /mob/living/simple_animal/pet/dog/corgi/puppy/slime(get_turf(user))
+ new /mob/living/basic/pet/dog/corgi/puppy/slime(get_turf(user))
..()
/obj/item/slimecross/chilling/gold
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
index 402c0a5ade4..0b3cf60d648 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
@@ -128,7 +128,7 @@
/datum/reagent/consumable/coco = -2)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/simple_animal/pet/dog/corgi = 1)
+ resulting_atoms = list(/mob/living/basic/pet/dog/corgi = 1)
/datum/micro_organism/cell_line/pug
desc = "Squat canid cells"
@@ -146,7 +146,7 @@
/datum/reagent/consumable/coco = -2)
virus_suspectibility = 3
- resulting_atoms = list(/mob/living/simple_animal/pet/dog/pug = 1)
+ resulting_atoms = list(/mob/living/basic/pet/dog/pug = 1)
/datum/micro_organism/cell_line/bear //bears can't really compete directly with more powerful creatures, so i made it possible to grow them real fast.
desc = "Ursine cells"
diff --git a/code/modules/spells/spell_types/shapeshift/shapechange.dm b/code/modules/spells/spell_types/shapeshift/shapechange.dm
index 2b52826b367..d7b2f36da64 100644
--- a/code/modules/spells/spell_types/shapeshift/shapechange.dm
+++ b/code/modules/spells/spell_types/shapeshift/shapechange.dm
@@ -12,7 +12,7 @@
possible_shapes = list(
/mob/living/basic/mouse,
- /mob/living/simple_animal/pet/dog/corgi,
+ /mob/living/basic/pet/dog/corgi,
/mob/living/simple_animal/hostile/carp/ranged/chaos,
/mob/living/simple_animal/bot/secbot/ed209,
/mob/living/simple_animal/hostile/giant_spider/viper/wizard,
diff --git a/code/modules/unit_tests/mindbound_actions.dm b/code/modules/unit_tests/mindbound_actions.dm
index 703144e2203..b9c934bc1e8 100644
--- a/code/modules/unit_tests/mindbound_actions.dm
+++ b/code/modules/unit_tests/mindbound_actions.dm
@@ -5,9 +5,8 @@
/datum/unit_test/actions_moved_on_mind_transfer
/datum/unit_test/actions_moved_on_mind_transfer/Run()
-
var/mob/living/carbon/human/wizard = allocate(/mob/living/carbon/human/consistent)
- var/mob/living/simple_animal/pet/dog/corgi/wizard_dog = allocate(/mob/living/simple_animal/pet/dog/corgi)
+ var/mob/living/basic/pet/dog/corgi/wizard_dog = allocate(/mob/living/basic/pet/dog/corgi)
wizard.mind_initialize()
var/datum/action/cooldown/spell/pointed/projectile/fireball/fireball = new(wizard.mind)
diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm
index 491d5f63152..f6dfd4f7665 100644
--- a/code/modules/unit_tests/simple_animal_freeze.dm
+++ b/code/modules/unit_tests/simple_animal_freeze.dm
@@ -356,20 +356,6 @@
/mob/living/simple_animal/pet/cat/original,
/mob/living/simple_animal/pet/cat/runtime,
/mob/living/simple_animal/pet/cat/space,
- /mob/living/simple_animal/pet/dog,
- /mob/living/simple_animal/pet/dog/breaddog,
- /mob/living/simple_animal/pet/dog/bullterrier,
- /mob/living/simple_animal/pet/dog/corgi,
- /mob/living/simple_animal/pet/dog/corgi/exoticcorgi,
- /mob/living/simple_animal/pet/dog/corgi/ian,
- /mob/living/simple_animal/pet/dog/corgi/lisa,
- /mob/living/simple_animal/pet/dog/corgi/narsie,
- /mob/living/simple_animal/pet/dog/corgi/puppy,
- /mob/living/simple_animal/pet/dog/corgi/puppy/ian,
- /mob/living/simple_animal/pet/dog/corgi/puppy/slime,
- /mob/living/simple_animal/pet/dog/corgi/puppy/void,
- /mob/living/simple_animal/pet/dog/pug,
- /mob/living/simple_animal/pet/dog/pug/mcgriff,
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/pet/fox/renault,
/mob/living/simple_animal/pet/gondola,
@@ -497,10 +483,6 @@
/mob/living/simple_animal/hostile/zombie/cheesezombie,
/mob/living/simple_animal/hostile/zombie/nocorpse,
/mob/living/simple_animal/pet/bumbles,
- /mob/living/simple_animal/pet/dog/corgi/borgi,
- /mob/living/simple_animal/pet/dog/dobermann,
- /mob/living/simple_animal/pet/dog/dobermann/walter,
- /mob/living/simple_animal/pet/dog/markus,
/mob/living/simple_animal/pet/gondola/funky,
/mob/living/simple_animal/pet/poppy,
diff --git a/code/modules/unit_tests/strippable.dm b/code/modules/unit_tests/strippable.dm
index dcffd79aaf8..62438c9b9a4 100644
--- a/code/modules/unit_tests/strippable.dm
+++ b/code/modules/unit_tests/strippable.dm
@@ -59,5 +59,5 @@
ADD_TRAIT(rouny, TRAIT_PRESERVE_UI_WITHOUT_CLIENT, TRAIT_SOURCE_UNIT_TESTS)
TEST_ASSERT_EQUAL(strip_menu.ui_status(rouny, ui_state), UI_INTERACTIVE, "Being within range as a xeno was not interactive.")
- var/mob/living/simple_animal/pet/dog/corgi/corgi = allocate(/mob/living/simple_animal/pet/dog/corgi, run_loc_floor_bottom_left)
+ var/mob/living/basic/pet/dog/corgi/corgi = allocate(/mob/living/basic/pet/dog/corgi, run_loc_floor_bottom_left)
TEST_ASSERT_EQUAL(strip_menu.ui_status(corgi, ui_state), UI_UPDATE, "Being within range as a corgi was not update-only.")
diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
index cad5837ef3d..6b0b5161f8e 100644
--- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
+++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
@@ -2,8 +2,8 @@
/datum/traitor_objective/kill_pet
possible_heads = list(
JOB_HEAD_OF_PERSONNEL = list(
- /mob/living/simple_animal/pet/dog/corgi/ian,
- /mob/living/simple_animal/pet/dog/corgi/puppy/ian
+ /mob/living/basic/pet/dog/corgi/ian,
+ /mob/living/basic/pet/dog/corgi/puppy/ian
),
JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault,
JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime,
@@ -15,7 +15,7 @@
),
// Non-heads like the warden, these are automatically medium-risk at minimum
// They are also the only two modular additions so far
- JOB_ROBOTICIST = /mob/living/simple_animal/pet/dog/corgi/borgi,
+ JOB_ROBOTICIST = /mob/living/basic/pet/dog/corgi/borgi,
JOB_STATION_ENGINEER = /mob/living/simple_animal/pet/poppy,
)
@@ -43,7 +43,7 @@
succeed_signals = list(COMSIG_PARENT_QDELETING)) // Until dusting gets its own component, this has to make do
// Emag E-N so it overloads
- if(istype(target_pet, /mob/living/simple_animal/pet/dog/corgi/borgi))
+ if(istype(target_pet, /mob/living/basic/pet/dog/corgi/borgi))
name = "Emag the roboticist's most-prized borgi, E-N"
description = "We received an untracable contract from someone addressed 'ianfan2489@solfed.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... "
telecrystal_reward = 3 // Because these are more complicated than 'kill the pet', the reward is bigger
@@ -88,7 +88,7 @@
// Handle the UI button, this is currently just generated by a modular objective
/datum/traitor_objective/kill_pet/generate_ui_buttons(mob/user)
var/list/buttons = list()
- if(istype(target_pet, /mob/living/simple_animal/pet/dog/corgi/borgi)) // Target has to be E-N
+ if(istype(target_pet, /mob/living/basic/pet/dog/corgi/borgi)) // Target has to be E-N
if(!one_shot_emag)
buttons += add_ui_button("", "Pressing this will materialize a single-use cryptographic sequencer in your hand, which you can use to shortcircuit E-N.", "bolt", "summon_emag")
return buttons
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
index 03666d51ac6..aa3228c0288 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
@@ -1,4 +1,4 @@
-/mob/living/simple_animal/pet/dog/markus
+/mob/living/basic/pet/dog/markus
name = "\proper Markus"
real_name = "Markus"
gender = MALE
@@ -7,14 +7,20 @@
icon_state = "markus"
icon_dead = "markus_dead"
icon_living = "markus"
- speak = list("Borf!", "Boof!", "Bork!", "Bowwow!", "Burg?")
+ var/static/list/markus_speak = list("Borf!", "Boof!", "Bork!", "Bowwow!", "Burg?")
butcher_results = list(/obj/item/food/burger/cheese = 1, /obj/item/food/meat/slab = 2, /obj/item/trash/syndi_cakes = 1)
- animal_species = /mob/living/simple_animal/pet/dog
+ ai_controller = /datum/ai_controller/dog/corgi
+ gender = MALE
can_be_held = FALSE
gold_core_spawnable = FRIENDLY_SPAWN
-/mob/living/simple_animal/pet/dog/markus/treat_message(message)
- return client ? pick(speak) : message // markus only talks business
+/mob/living/basic/pet/dog/markus/treat_message(message)
+ return client ? pick(markus_speak) : message // markus only talks business
+
+/mob/living/basic/pet/dog/markus/update_dog_speech(datum/ai_planning_subtree/random_speech/speech)
+ . = ..()
+
+ speech.speak = markus_speak
/datum/chemical_reaction/mark_reaction
results = list(/datum/reagent/liquidgibs = 15)
@@ -32,10 +38,10 @@
/datum/chemical_reaction/mark_reaction/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
. = ..()
var/location = get_turf(holder.my_atom)
- new /mob/living/simple_animal/pet/dog/markus(location)
+ new /mob/living/basic/pet/dog/markus(location)
playsound(location, 'modular_skyrat/master_files/sound/effects/dorime.ogg', 100, 0, 7)
-/mob/living/simple_animal/pet/dog/corgi/borgi
+/mob/living/basic/pet/dog/corgi/borgi
name = "E-N"
real_name = "E-N" // Intended to hold the name without altering it.
gender = NEUTER
@@ -48,17 +54,12 @@
can_be_held = FALSE
maxHealth = 150
health = 150
- var/emagged = 0
- turns_per_move = 10
- stop_automated_movement = 0
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- loot = list(/obj/effect/decal/cleanable/oil/slippery)
butcher_results = list(/obj/item/clothing/head/corgi/en = 1, /obj/item/clothing/suit/corgisuit/en = 1)
death_message = "beeps, its mechanical parts hissing before the chassis collapses in a loud thud."
gold_core_spawnable = NO_SPAWN
- animal_species = /mob/living/simple_animal/pet/dog/corgi
nofur = TRUE
+ ai_controller = /datum/ai_controller/dog/borgi
+
// These lights enable when E-N is emagged
light_system = MOVABLE_LIGHT_DIRECTIONAL
light_color = COLOR_RED
@@ -66,8 +67,17 @@
light_power = 0.8
light_on = FALSE
-/mob/living/simple_animal/pet/dog/corgi/borgi/Initialize(mapload)
+ var/emagged = 0
+
+/mob/living/basic/pet/dog/corgi/borgi/Initialize(mapload)
. = ..()
+
+ RemoveElement(/datum/element/atmos_requirements)
+ RemoveElement(/datum/element/basic_body_temp_sensitive)
+ AddElement(/datum/element/basic_body_temp_sensitive, min_body_temp = 0)
+ var/static/list/borgi_drops = list(/obj/effect/decal/cleanable/oil/slippery)
+ AddElement(/datum/element/death_drops, borgi_drops)
+
var/datum/component/overlay_lighting/lighting_object = src.GetComponent(/datum/component/overlay_lighting)
var/image/cone = lighting_object.cone
cone.transform = cone.transform.Translate(0, -8)
@@ -79,55 +89,78 @@
// For traitor objectives
RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act))
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/on_attack_hand(datum/source, mob/living/target)
- if(target.combat_mode && health > 0)
- shootAt(target)
- var/datum/ai_controller/dog/EN = ai_controller
- if(health <= 30 && !(WEAKREF(target) in EN.blackboard[BB_DOG_FRIENDS]))
- EN.current_movement_target = target
- EN.blackboard[BB_DOG_HARASS_TARGET] = WEAKREF(target)
- EN.current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/harass)
+/**
+ * Try to harass a target, considering if they are a friend.
+ *
+ * Arguments:
+ * * target - the target to harrass
+ * * always_shoot - always shoot the target, as opposed to only if not a friend.
+ */
+/mob/living/basic/pet/dog/corgi/borgi/proc/harass_target(mob/living/target, always_shoot = FALSE)
+ var/datum/ai_controller/dog/EN = ai_controller
+ if(!EN)
+ return
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/on_attackby(datum/source, obj/item/used_item, mob/living/target)
- if(used_item.force && used_item.damtype != STAMINA && health > 0)
- shootAt(target)
- var/datum/ai_controller/dog/EN = ai_controller
- if(health <= 30 && !(WEAKREF(target) in EN.blackboard[BB_DOG_FRIENDS]))
- EN.current_movement_target = target
- EN.blackboard[BB_DOG_HARASS_TARGET] = WEAKREF(target)
- EN.current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/harass)
+ var/is_friend = EN.blackboard[BB_DOG_FRIENDS][WEAKREF(target)]
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/on_hitby(datum/source, atom/movable/AM)
- if(istype(AM, /obj/item))
- var/obj/item/used_item = AM
- var/mob/thrown_by = used_item.thrownby?.resolve()
- if(used_item.throwforce >= 5 && ishuman(thrown_by) && health > 0)
- var/mob/living/carbon/human/target = thrown_by
- var/datum/ai_controller/dog/EN = ai_controller
- if(!(WEAKREF(target) in EN.blackboard[BB_DOG_FRIENDS]))
- shootAt(target)
- if(health <= 30)
- EN.current_movement_target = target
- EN.blackboard[BB_DOG_HARASS_TARGET] = WEAKREF(target)
- EN.current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/harass)
+ if(always_shoot || !is_friend)
+ INVOKE_ASYNC(src, PROC_REF(shoot_at), target)
-/mob/living/simple_animal/pet/dog/corgi/borgi/bullet_act(obj/projectile/proj)
- if(istype(proj, /obj/projectile/beam) || istype(proj, /obj/projectile/bullet))
- var/mob/living/carbon/human/target = proj.firer
- if(!proj.nodamage && proj.damage >= 10)
- if((proj.damage_type == BRUTE || proj.damage_type == BURN))
- adjustBruteLoss(proj.damage)
- if(isliving(target) && health > 0)
- shootAt(target)
- var/datum/ai_controller/dog/EN = ai_controller
- EN.current_movement_target = target
- EN.blackboard[BB_DOG_HARASS_TARGET] = WEAKREF(target)
- EN.current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/harass)
- else
- shootToyAt(target)
- return BULLET_ACT_HIT
+ if(health > 30 || is_friend)
+ return
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/shootAt(atom/movable/target)
+ EN.set_movement_target(target)
+ EN.blackboard[BB_DOG_HARASS_TARGET] = WEAKREF(target)
+ EN.queue_behavior(/datum/ai_behavior/harass)
+
+/mob/living/basic/pet/dog/corgi/borgi/proc/on_attack_hand(datum/source, mob/living/target)
+ SIGNAL_HANDLER
+
+ if(!target.combat_mode || health <= 0)
+ return
+
+ harass_target(target, always_shoot = TRUE)
+
+/mob/living/basic/pet/dog/corgi/borgi/proc/on_attackby(datum/source, obj/item/used_item, mob/living/target)
+ SIGNAL_HANDLER
+
+ if(!used_item.force || used_item.damtype == STAMINA || health <= 0)
+ return
+
+ harass_target(target, always_shoot = TRUE)
+
+/mob/living/basic/pet/dog/corgi/borgi/proc/on_hitby(datum/source, obj/item/used_item)
+ SIGNAL_HANDLER
+
+ if(!istype(used_item) || used_item.throwforce < 5 || health <= 0)
+ return
+
+ var/mob/living/carbon/human/thrown_by = used_item.thrownby?.resolve()
+ if(!ishuman(thrown_by))
+ return
+
+ harass_target(thrown_by)
+
+/mob/living/basic/pet/dog/corgi/borgi/bullet_act(obj/projectile/proj)
+ . = ..()
+
+ if(!istype(proj, /obj/projectile/beam) && !istype(proj, /obj/projectile/bullet))
+ return
+
+ var/mob/living/carbon/human/target = proj.firer
+ if(!proj.nodamage && proj.damage >= 10)
+ if(proj.damage_type != BRUTE && proj.damage_type != BURN)
+ return
+
+ adjustBruteLoss(proj.damage)
+ if(!isliving(target) || health <= 0)
+ return
+
+ harass_target(target)
+ else
+ shoot_toy_at(target)
+
+/mob/living/basic/pet/dog/corgi/borgi/proc/shoot_at(atom/movable/target)
var/turf/source_turf = get_turf(src)
var/turf/target_turf = get_turf(target)
if(!source_turf || !target_turf)
@@ -141,7 +174,7 @@
laser.fired_from = src
laser.fire()
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/shootToyAt(atom/movable/target)
+/mob/living/basic/pet/dog/corgi/borgi/proc/shoot_toy_at(atom/movable/target)
var/turf/source_turf = get_turf(src)
var/turf/target_turf = get_turf(target)
if(!source_turf || !target_turf)
@@ -155,19 +188,14 @@
fired_dart.fired_from = src
fired_dart.fire()
-/mob/living/simple_animal/pet/dog/corgi/borgi/Life(seconds, times_fired)
- ..()
+/mob/living/basic/pet/dog/corgi/borgi/Life(seconds, times_fired)
+ . = ..()
+
// spark for no reason
if(prob(5))
do_sparks(3, 1, src)
-/mob/living/simple_animal/pet/dog/corgi/borgi/handle_automated_action()
- if(emagged && prob(33))
- var/mob/living/carbon/target = locate() in view(10, src)
- if(target)
- shootAt(target)
-
-/mob/living/simple_animal/pet/dog/corgi/borgi/death(gibbed)
+/mob/living/basic/pet/dog/corgi/borgi/death(gibbed)
// Only execute the below if we successfully died
. = ..(gibbed)
if(!.)
@@ -182,31 +210,105 @@
var/datum/ai_controller/dog/EN = ai_controller
LAZYCLEARLIST(EN.current_behaviors)
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/on_emag_act(mob/living/simple_animal/pet/dog/target, mob/user)
- if(!emagged)
- emagged = 1
+/mob/living/basic/pet/dog/corgi/borgi/proc/on_emag_act(mob/living/basic/pet/dog/target, mob/user)
+ SIGNAL_HANDLER
- emote("exclaim")
- set_light_on(TRUE)
+ if(emagged)
+ return
- add_fingerprint(user, TRUE)
- investigate_log("has been gibbed due to being emagged by [user].", INVESTIGATE_DEATHS)
- visible_message(span_boldwarning("[user] swipes a card through [target]!"), span_notice("You overload [target]s internal reactor..."))
+ emagged = 1
- notify_ghosts("[user] has shortcircuited [target] to explode in 60 seconds!", source = target, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Borgi Emagged")
- addtimer(CALLBACK(src, PROC_REF(explode_imminent)), 50 SECONDS)
+ // Emote sleeps.
+ INVOKE_ASYNC(src, PROC_REF(emote), "exclaim")
+ set_light_on(TRUE)
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode_imminent()
+ add_fingerprint(user, TRUE)
+ investigate_log("has been gibbed due to being emagged by [user].", INVESTIGATE_DEATHS)
+ visible_message(span_boldwarning("[user] swipes a card through [target]!"), span_notice("You overload [target]s internal reactor..."))
+
+ notify_ghosts("[user] has shortcircuited [target] to explode in 60 seconds!", source = target, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Borgi Emagged")
+ addtimer(CALLBACK(src, PROC_REF(explode_imminent)), 50 SECONDS)
+
+/mob/living/basic/pet/dog/corgi/borgi/proc/explode_imminent()
visible_message(span_bolddanger("[src] makes an odd whining noise!"))
do_jitter_animation(30)
addtimer(CALLBACK(src, PROC_REF(explode)), 10 SECONDS)
-/mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode()
+/mob/living/basic/pet/dog/corgi/borgi/proc/explode()
explosion(get_turf(src), 1, 2, 4, 4, 6) // Should this be changed?
gib() // Yuck, robo-blood
-/mob/living/simple_animal/pet/dog/dobermann
+/// Dog controller but with emag attack support
+/datum/ai_controller/dog/borgi
+ blackboard = list(
+ BB_SIMPLE_CARRY_ITEM = null,
+ BB_FETCH_TARGET = null,
+ BB_FETCH_DELIVER_TO = null,
+ BB_DOG_FRIENDS = list(),
+ BB_FETCH_IGNORE_LIST = list(),
+ BB_DOG_ORDER_MODE = DOG_COMMAND_NONE,
+ BB_DOG_PLAYING_DEAD = FALSE,
+ BB_DOG_HARASS_TARGET = null,
+ BB_DOG_HARASS_FRUSTRATION = null,
+ BB_VISION_RANGE = AI_DOG_VISION_RANGE,
+ BB_DOG_IS_SLOW = TRUE,
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic(),
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/emagged_borgi,
+ /datum/ai_planning_subtree/random_speech/dog,
+ /datum/ai_planning_subtree/dog,
+ )
+
+/// Subtree that schedules borgi to randomly shoot if they're emagged.
+/datum/ai_planning_subtree/emagged_borgi
+ /// Probability that emagged borgi will randomly attack.
+ var/chance = 33
+ /// Range to immediately target enemies
+ var/view_range = 10
+
+/datum/ai_planning_subtree/emagged_borgi/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+
+ // Emagged borgi?
+ var/mob/living/basic/pet/dog/corgi/borgi/borgi_pawn = controller.pawn
+ if(!istype(borgi_pawn) || !borgi_pawn.emagged)
+ return
+
+ // Target if not already targetted and prob check passes.
+ var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ var/atom/target = weak_target?.resolve()
+ if(QDELETED(target))
+ if(!DT_PROB(chance, delta_time))
+ return
+
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ return
+
+ // Attack.
+ controller.queue_behavior(/datum/ai_behavior/emagged_borgi_attack, BB_BASIC_MOB_CURRENT_TARGET)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+/**
+ * Shoot a random target.
+ */
+/datum/ai_behavior/emagged_borgi_attack
+ action_cooldown = 3 SECONDS
+
+/datum/ai_behavior/emagged_borgi_attack/perform(delta_time, datum/ai_controller/controller, target_key)
+ var/atom/target = controller.blackboard[target_key]
+ if(QDELETED(target))
+ return
+
+ var/mob/living/basic/pet/dog/corgi/borgi/borgi_pawn = controller.pawn
+ if(!istype(borgi_pawn))
+ return
+
+ borgi_pawn.shoot_at(target)
+
+/mob/living/basic/pet/dog/dobermann
name = "\proper Dobermann"
gender = MALE
desc = "A larger breed of dog."
@@ -214,4 +316,3 @@
icon_state = "dobber"
icon_dead = "dobbydead"
icon_living = "dobber"
-
diff --git a/modular_skyrat/modules/automapper/code/area_spawn_entries.dm b/modular_skyrat/modules/automapper/code/area_spawn_entries.dm
index b698aab3de6..a993f3cbccb 100644
--- a/modular_skyrat/modules/automapper/code/area_spawn_entries.dm
+++ b/modular_skyrat/modules/automapper/code/area_spawn_entries.dm
@@ -1,7 +1,7 @@
// Pets
/datum/area_spawn/markus
target_areas = list(/area/station/cargo/sorting, /area/station/cargo/storage, /area/station/cargo/office, /area/station/command/heads_quarters/qm)
- desired_atom = /mob/living/simple_animal/pet/dog/markus
+ desired_atom = /mob/living/basic/pet/dog/markus
/datum/area_spawn/bumbles
target_areas = list(/area/station/service/hydroponics, /area/station/service/hydroponics/upper)
@@ -9,7 +9,7 @@
/datum/area_spawn/borgi
target_areas = list(/area/station/science/robotics, /area/station/science/robotics/mechbay, /area/station/science/robotics/lab)
- desired_atom = /mob/living/simple_animal/pet/dog/corgi/borgi
+ desired_atom = /mob/living/basic/pet/dog/corgi/borgi
/datum/area_spawn/poppy
target_areas = list(/area/station/engineering/main, /area/station/engineering/break_room, /area/station/engineering/lobby, /area/station/engineering/supermatter/room)
diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
index b983617e46d..60b918a3539 100644
--- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
+++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
@@ -23,7 +23,8 @@
/mob/living/basic/banana_spider/Initialize(mapload)
. = ..()
AddComponent(/datum/component/slippery, 40)
- AddElement(/datum/element/death_drops, list(/obj/item/food/deadbanana_spider))
+ var/static/list/banana_drops = list(/obj/item/food/deadbanana_spider)
+ AddElement(/datum/element/death_drops, banana_drops)
AddElement(/datum/element/basic_body_temp_sensitive, 270, INFINITY)
AddComponent(/datum/component/squashable, squash_chance = 50, squash_damage = 1)
diff --git a/modular_skyrat/modules/chadian/code/chadian.dm b/modular_skyrat/modules/chadian/code/chadian.dm
index a47dff55ed5..7d00a3c86ae 100644
--- a/modular_skyrat/modules/chadian/code/chadian.dm
+++ b/modular_skyrat/modules/chadian/code/chadian.dm
@@ -2,53 +2,68 @@
#define RESTING_STATE_SIT 1
#define RESTING_STATE_REST 2
-/mob/living/simple_animal/pet/dog/corgi/ian
+/mob/living/basic/pet/dog/corgi/ian
+ icon = 'modular_skyrat/modules/chadian/icons/ian.dmi'
+ ai_controller = /datum/ai_controller/dog/corgi/chadian
+
var/resting_state = 0
- var/old = FALSE
-/mob/living/simple_animal/pet/dog/corgi/ian/Life(delta_time = SSMOBS_DT, times_fired)
- if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
- Write_Memory(FALSE)
- memory_saved = TRUE
- if(!stat && !buckled && !client && !inventory_head && !inventory_back)
- if(DT_PROB(0.5, delta_time))
- manual_emote(pick("flops forward laying flat.", "wags [p_their()] tail.", "lies down."))
- set_rest_state(RESTING_STATE_REST)
- else if(DT_PROB(0.5, delta_time))
- manual_emote(pick("sits down.", "crouches on [p_their()] hind legs.", "looks alert."))
- set_rest_state(RESTING_STATE_SIT)
- else if(DT_PROB(0.5, delta_time))
- if (resting_state)
- manual_emote(pick("gets up and barks.", "walks around.", "stops resting."))
- set_rest_state(RESTING_STATE_NONE)
- else
- manual_emote(pick("grooms [p_their()] fur.", "twitches [p_their()] ears.", "shakes [p_their()] fur."))
- ..()
+/// AI controller that adds chad ian emotes
+/datum/ai_controller/dog/corgi/chadian
+ idle_behavior = /datum/idle_behavior/idle_dog/chadian
-/mob/living/simple_animal/pet/dog/corgi/ian/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
+/// Actual idle behavior that adds chad ian emotes
+/datum/idle_behavior/idle_dog/chadian/perform_idle_behavior(delta_time, datum/ai_controller/dog/controller)
+ . = ..()
+
+ var/mob/living/basic/pet/dog/corgi/ian/ian_pawn = controller.pawn
+
+ if(ian_pawn.buckled || ian_pawn.pulledby || ian_pawn.inventory_head || ian_pawn.inventory_back)
+ return
+
+ if(DT_PROB(0.5, delta_time))
+ ian_pawn.manual_emote(pick("flops forward laying flat.", "wags [p_their()] tail.", "lies down."))
+ ian_pawn.set_rest_state(RESTING_STATE_REST)
+ else if(DT_PROB(0.5, delta_time))
+ ian_pawn.manual_emote(pick("sits down.", "crouches on [p_their()] hind legs.", "looks alert."))
+ ian_pawn.set_rest_state(RESTING_STATE_SIT)
+ else if(DT_PROB(0.5, delta_time))
+ if (ian_pawn.resting_state)
+ ian_pawn.manual_emote(pick("gets up and barks.", "walks around.", "stops resting."))
+ ian_pawn.set_rest_state(RESTING_STATE_NONE)
+ else
+ ian_pawn.manual_emote(pick("grooms [p_their()] fur.", "twitches [p_their()] ears.", "shakes [p_their()] fur."))
+
+/mob/living/basic/pet/dog/corgi/ian/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(resting_state)
manual_emote(pick("gets up and barks.", "walks around.", "stops resting."))
set_rest_state(RESTING_STATE_NONE)
-/mob/living/simple_animal/pet/dog/corgi/ian/proc/set_rest_state(state)
+/mob/living/basic/pet/dog/corgi/ian/proc/set_rest_state(state)
resting_state = state
update_icons()
-/mob/living/simple_animal/pet/dog/corgi/ian/update_icons()
+/mob/living/basic/pet/dog/corgi/ian/update_icons()
. = ..()
- if(old && !stat)
+
+ // Dead
+ if(stat)
+ icon_state = "[initial(icon_state)][is_slow ? "_old" : ""][shaved ? "_shaved" : ""]_dead"
+ return
+
+ // Wheelchair
+ if(is_slow)
icon_state = "[initial(icon_state)]_old[shaved ? "_shaved" : ""]"
- else if(!stat)
- switch(resting_state)
- if(RESTING_STATE_NONE)
- icon_state = initial(icon_state)
- if(RESTING_STATE_SIT)
- icon_state = "[initial(icon_state)]_sit[shaved ? "_shaved" : ""]"
- if(RESTING_STATE_REST)
- icon_state = "[initial(icon_state)]_rest[shaved ? "_shaved" : ""]"
- else
- icon_state = icon_dead
+ return
+
+ switch(resting_state)
+ if(RESTING_STATE_NONE)
+ icon_state = initial(icon_state)
+ if(RESTING_STATE_SIT)
+ icon_state = "[initial(icon_state)]_sit[shaved ? "_shaved" : ""]"
+ if(RESTING_STATE_REST)
+ icon_state = "[initial(icon_state)]_rest[shaved ? "_shaved" : ""]"
#undef RESTING_STATE_NONE
#undef RESTING_STATE_SIT
diff --git a/modular_skyrat/modules/chadian/icons/ian.dmi b/modular_skyrat/modules/chadian/icons/ian.dmi
index fe59205d82b..8b33165e237 100644
Binary files a/modular_skyrat/modules/chadian/icons/ian.dmi and b/modular_skyrat/modules/chadian/icons/ian.dmi differ
diff --git a/modular_skyrat/modules/mapping/voidraptor/code/mob.dm b/modular_skyrat/modules/mapping/voidraptor/code/mob.dm
index b6e19c200bd..7eb54486fd6 100644
--- a/modular_skyrat/modules/mapping/voidraptor/code/mob.dm
+++ b/modular_skyrat/modules/mapping/voidraptor/code/mob.dm
@@ -71,7 +71,7 @@
desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable. This one seems a little skinny and attached to the Theater."
loot = list(/obj/effect/decal/cleanable/blood/gibs)
-/mob/living/simple_animal/pet/dog/dobermann/walter
+/mob/living/basic/pet/dog/dobermann/walter
name = "Walter"
real_name = "Walter"
desc = "It's Walter, he bites criminals just as well as he bites toddlers."
diff --git a/tgstation.dme b/tgstation.dme
index 8a5a7353f87..051d0009ce2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -781,6 +781,8 @@
#include "code\datums\ai\_ai_planning_subtree.dm"
#include "code\datums\ai\_item_behaviors.dm"
#include "code\datums\ai\telegraph_effects.dm"
+#include "code\datums\ai\babies\babies_behaviors.dm"
+#include "code\datums\ai\babies\babies_subtrees.dm"
#include "code\datums\ai\bane\bane_behaviors.dm"
#include "code\datums\ai\bane\bane_controller.dm"
#include "code\datums\ai\bane\bane_subtrees.dm"
@@ -3676,6 +3678,8 @@
#include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_instrument.dm"
#include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_loot.dm"
#include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_vileworm.dm"
+#include "code\modules\mob\living\basic\pets\dog.dm"
+#include "code\modules\mob\living\basic\pets\pet.dm"
#include "code\modules\mob\living\basic\ruin_defender\stickman.dm"
#include "code\modules\mob\living\basic\vermin\axolotl.dm"
#include "code\modules\mob\living\basic\vermin\cockroach.dm"
@@ -3847,7 +3851,6 @@
#include "code\modules\mob\living\simple_animal\friendly\butterfly.dm"
#include "code\modules\mob\living\simple_animal\friendly\cat.dm"
#include "code\modules\mob\living\simple_animal\friendly\crab.dm"
-#include "code\modules\mob\living\simple_animal\friendly\dog.dm"
#include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
#include "code\modules\mob\living\simple_animal\friendly\fox.dm"
#include "code\modules\mob\living\simple_animal\friendly\gondola.dm"
diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx
index 4bd364db4bb..f96cf6063f5 100644
--- a/tgui/packages/tgui/interfaces/StripMenu.tsx
+++ b/tgui/packages/tgui/interfaces/StripMenu.tsx
@@ -105,7 +105,7 @@ const SLOTS: Record<
image: 'inventory-mask.png',
},
- corgi_collar: {
+ pet_collar: {
displayName: 'collar',
gridSpot: getGridSpotKey([1, 2]),
image: 'inventory-collar.png',
diff --git a/tools/UpdatePaths/Scripts/70799_dog.txt b/tools/UpdatePaths/Scripts/70799_dog.txt
new file mode 100644
index 00000000000..5fa46436466
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/70799_dog.txt
@@ -0,0 +1 @@
+/mob/living/simple_animal/pet/dog/@SUBTYPES : /mob/living/basic/pet/dog/@SUBTYPES {@OLD}