mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
[MIRROR] Mail sorting helper, and disposals fixes [MDB IGNORE] (#17683)
* Mail sorting helper, and disposals fixes (#70861) ## About The Pull Request  This PR adds a mail sorting map helper, which during Late Initialization will apply a sorting location index to the mail sorting disposals pipe under them. I have replaced the varedits with all mail sorters with the appropriate map helpers. I have thoroughly tested this, making sure packages arrived to every location, where possible. I have also fixed a few issues with the disposals network: **Tramstation** - One of the random maintenance segments had a place with no disposal pipes. This has been fixed - A sorter was looking for chapel and library packages, but it actually meant to look for engineering packages - There was no dormitory mail sorter, I have added one **Metastation** - There was no dormitory mail sorter, I have added one **Icebox** - There is no experimentor lab in icebox, but there is an "experimentation" lab, which is good enough, so I have added it as a location **Deltastation** - There was no dormitory mail sorter, I have added one - Virology was not connected to the disposals network. However, on every other map, it has a one way connection. I have hooked it up just like that, so virology mail will arrive safely, and virology trash will go into space as usual. **Kilostation** - Genetics packages were rerouted to the psychologist office Unsolved issue on kilostation: there is no experimentor on this station, and there is no space for a disposals in the circuits lab, so sadly, if you send a package to this destination, it will come back to the mail sorting office. **Future improvements** The TAGGERLOCATIONS list, which is used to retrieve the labels of the various tags, is frankly unorganizable, and hard to expand. I have delayed fixing this for a future PR. I kinda wish to remove the sortType variable, as it is no longer necessary to have it around with these helpers, but sadly, this would ruin downstream maps, so I have no plans for this at the moment. ## Why It's Good For The Game While mapping, having to constantly compare a comment in flavor_misc.dm to figure out what to varedit a disposal mail sorter to is rather annoying. These map helpers, similar to the access helpers, will help with this issue. Its also good if mail actually arrives. ## Changelog 🆑 qol: added a mail sorting map helper, to allow mappers to create disposal networks faster fix: fixes several non working disposal mail targets that never received their packages /🆑 * Mail sorting helper, and disposals fixes * vr fixes Co-authored-by: Profakos <profakos@gmail.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
@@ -61,9 +61,9 @@
|
||||
/area/ruin/powered/clownplanet)
|
||||
"av" = (
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 1;
|
||||
sortType = 3
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/ruin/powered/clownplanet)
|
||||
"aw" = (
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2327,13 +2327,13 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 2;
|
||||
name = "Robotics Junction";
|
||||
sortType = 14
|
||||
name = "Robotics Junction"
|
||||
},
|
||||
/obj/structure/sink/directional/west,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/robotics,
|
||||
/turf/open/floor/iron/white/smooth_edge{
|
||||
dir = 8
|
||||
},
|
||||
@@ -3991,9 +3991,9 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "Library Junction";
|
||||
sortType = 16
|
||||
name = "Library Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/library,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/hallway/primary/central/fore)
|
||||
"bis" = (
|
||||
@@ -4836,13 +4836,13 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "Ordnance Junction";
|
||||
sortType = 25
|
||||
name = "Ordnance Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
|
||||
/turf/open/floor/iron/smooth_large,
|
||||
/area/station/science/ordnance/office)
|
||||
"bxO" = (
|
||||
@@ -7912,10 +7912,10 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 8;
|
||||
name = "Experimentor Lab Junction";
|
||||
sortType = 24
|
||||
name = "Experimentor Lab Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/purple/diagonal_centre,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab,
|
||||
/turf/open/floor/iron/white/diagonal,
|
||||
/area/station/science/research)
|
||||
"cvn" = (
|
||||
@@ -8719,6 +8719,7 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
|
||||
/turf/open/floor/iron/white/smooth_edge{
|
||||
dir = 8
|
||||
},
|
||||
@@ -10743,10 +10744,10 @@
|
||||
"dlN" = (
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "Bar Junction";
|
||||
sortType = 19
|
||||
name = "Bar Junction"
|
||||
},
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/bar,
|
||||
/turf/open/floor/iron/white/smooth_large,
|
||||
/area/station/hallway/primary/fore)
|
||||
"dlU" = (
|
||||
@@ -14940,10 +14941,10 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 2;
|
||||
name = "Research Junction";
|
||||
sortType = 12
|
||||
name = "Research Junction"
|
||||
},
|
||||
/obj/machinery/duct,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/research,
|
||||
/turf/open/floor/iron/white/smooth_edge{
|
||||
dir = 8
|
||||
},
|
||||
@@ -15688,6 +15689,7 @@
|
||||
name = "Xenobio Junction";
|
||||
sortType = 28
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
|
||||
/turf/open/floor/iron/white/smooth_large,
|
||||
/area/station/science/xenobiology)
|
||||
"ezT" = (
|
||||
@@ -18558,6 +18560,7 @@
|
||||
/obj/effect/turf_decal/trimline/yellow/filled/warning{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
|
||||
/turf/open/floor/iron/smooth_edge,
|
||||
/area/station/engineering/power_room)
|
||||
"frR" = (
|
||||
@@ -20325,9 +20328,9 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "HydroponicsJunction";
|
||||
sortType = 21
|
||||
name = "HydroponicsJunction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/hallway/primary/central/fore)
|
||||
"fWc" = (
|
||||
@@ -21525,10 +21528,10 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 2;
|
||||
name = "Xenobio Junction";
|
||||
sortType = 28
|
||||
name = "Xenobio Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/purple/diagonal_centre,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
|
||||
/turf/open/floor/iron/white/diagonal,
|
||||
/area/station/science/research)
|
||||
"glS" = (
|
||||
@@ -33497,10 +33500,10 @@
|
||||
},
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
name = "CMO's Junction";
|
||||
sortType = 10
|
||||
name = "CMO's Junction"
|
||||
},
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
|
||||
/turf/open/floor/iron/white/smooth_corner{
|
||||
dir = 4
|
||||
},
|
||||
@@ -35468,8 +35471,7 @@
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "Security Junction";
|
||||
sortType = 7
|
||||
name = "Security Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
|
||||
cycle_id = "brig-entrance-fore"
|
||||
@@ -35483,6 +35485,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
|
||||
/obj/effect/mapping_helpers/mail_sorting/security/general,
|
||||
/turf/open/floor/iron/dark/smooth_large,
|
||||
/area/station/security/office)
|
||||
"kkl" = (
|
||||
@@ -38667,12 +38670,12 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 2;
|
||||
name = "RD Junction";
|
||||
sortType = 13
|
||||
name = "RD Junction"
|
||||
},
|
||||
/obj/machinery/light_switch/directional/east{
|
||||
pixel_x = 37
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/command/heads_quarters/rd)
|
||||
"lar" = (
|
||||
@@ -39025,9 +39028,11 @@
|
||||
/obj/machinery/light/warm/directional/east,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 2;
|
||||
name = "Satellite Junction";
|
||||
sortTypes = list(24,25,28)
|
||||
name = "Satellite Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/ordnance,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
|
||||
/turf/open/floor/iron/white/smooth_edge{
|
||||
dir = 8
|
||||
},
|
||||
@@ -40257,9 +40262,9 @@
|
||||
"lxc" = (
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "Disposals Junction";
|
||||
sortType = 1
|
||||
name = "Disposals Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
|
||||
/turf/open/floor/iron/smooth_large,
|
||||
/area/station/hallway/primary/aft)
|
||||
"lxr" = (
|
||||
@@ -40360,10 +40365,10 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "Chapel Junction";
|
||||
sortType = 17
|
||||
name = "Chapel Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/vg_decals/department/sec,
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/chapel,
|
||||
/turf/open/floor/iron/dark/smooth_edge,
|
||||
/area/station/hallway/primary/fore)
|
||||
"lze" = (
|
||||
@@ -40414,12 +40419,12 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "HoP Junction";
|
||||
sortType = 15
|
||||
name = "HoP Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/trimline/blue/filled/corner{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
|
||||
/turf/open/floor/iron/dark/smooth_corner{
|
||||
dir = 8
|
||||
},
|
||||
@@ -42040,9 +42045,9 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 2;
|
||||
name = "Pharmacy Junction";
|
||||
sortType = 11
|
||||
name = "Pharmacy Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
|
||||
/turf/open/floor/iron/white/smooth_large,
|
||||
/area/station/medical/medbay/lobby)
|
||||
"lVG" = (
|
||||
@@ -48311,9 +48316,9 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 1;
|
||||
name = "Cargo Bay Junction";
|
||||
sortType = 2
|
||||
name = "Cargo Bay Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
|
||||
/turf/open/floor/iron/smooth_corner{
|
||||
dir = 1
|
||||
},
|
||||
@@ -48398,9 +48403,9 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 2;
|
||||
name = "Theatre Junction";
|
||||
sortType = 18
|
||||
name = "Theatre Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/theater,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/hallway/primary/central/fore)
|
||||
"nEG" = (
|
||||
@@ -50892,11 +50897,11 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "HoS Junction";
|
||||
sortType = 8
|
||||
name = "HoS Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/siding/red/corner,
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
|
||||
/turf/open/floor/iron/dark/smooth_edge{
|
||||
dir = 4
|
||||
},
|
||||
@@ -52793,9 +52798,9 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 4;
|
||||
name = "Quartermaster's Junction";
|
||||
sortType = 3
|
||||
name = "Quartermaster's Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
|
||||
/turf/open/floor/iron/smooth_large,
|
||||
/area/station/cargo/storage)
|
||||
"oQK" = (
|
||||
@@ -54113,9 +54118,9 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 2;
|
||||
name = "Medbay Junction";
|
||||
sortType = 11
|
||||
name = "Medbay Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/general,
|
||||
/turf/open/floor/iron/white/smooth_corner,
|
||||
/area/station/medical/medbay/central)
|
||||
"phD" = (
|
||||
@@ -65031,9 +65036,9 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 1;
|
||||
name = "Janitor Junction";
|
||||
sortType = 22
|
||||
name = "Janitor Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/hallway/primary/central/fore)
|
||||
"ska" = (
|
||||
@@ -66672,10 +66677,10 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 2;
|
||||
name = "Genetics Junction";
|
||||
sortType = 23
|
||||
name = "Genetics Junction"
|
||||
},
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/genetics,
|
||||
/turf/open/floor/wood/large,
|
||||
/area/station/command/heads_quarters/rd)
|
||||
"sGC" = (
|
||||
@@ -67664,9 +67669,9 @@
|
||||
"sSF" = (
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 4;
|
||||
name = "Dormitories Junction";
|
||||
sortType = 26
|
||||
name = "Dormitories Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
|
||||
/turf/open/floor/iron/small,
|
||||
/area/station/commons/dorms)
|
||||
"sSH" = (
|
||||
@@ -71468,10 +71473,10 @@
|
||||
"tUt" = (
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "Kitchen Junction";
|
||||
sortType = 20
|
||||
name = "Kitchen Junction"
|
||||
},
|
||||
/obj/effect/landmark/start/hangover,
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
|
||||
/turf/open/floor/iron/dark/smooth_large,
|
||||
/area/station/hallway/primary/fore)
|
||||
"tUw" = (
|
||||
@@ -86090,11 +86095,11 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/disposalpipe/sorting/mail/flip{
|
||||
dir = 4;
|
||||
name = "Armospherics Junction";
|
||||
sortType = 6
|
||||
name = "Armospherics Junction"
|
||||
},
|
||||
/obj/machinery/holopad,
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
|
||||
/turf/open/floor/iron/smooth_large,
|
||||
/area/station/engineering/atmos/storage)
|
||||
"xYs" = (
|
||||
@@ -86284,9 +86289,9 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 2;
|
||||
name = "Virology Junction";
|
||||
sortType = 27
|
||||
name = "Virology Junction"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
|
||||
/turf/open/floor/iron/white/smooth_edge{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -351,6 +351,16 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/catwalk_floor,
|
||||
/area/station/maintenance/central/lesser)
|
||||
"JP" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/turf_decal/sand/plating,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"Ka" = (
|
||||
/obj/machinery/plumbing/synthesizer{
|
||||
reagent_id = /datum/reagent/water
|
||||
@@ -359,6 +369,16 @@
|
||||
/obj/effect/decal/cleanable/cobweb/cobweb2,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"KD" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/turf_decal/sand/plating,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"Lm" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/bot,
|
||||
@@ -458,6 +478,16 @@
|
||||
},
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"PP" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/turf_decal/sand/plating,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"Rt" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/spawner/random/trash/moisture_trap,
|
||||
@@ -468,6 +498,14 @@
|
||||
/obj/structure/grille,
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"Se" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/turf_decal/sand/plating,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/dorms)
|
||||
"Sr" = (
|
||||
/obj/machinery/duct,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -1905,11 +1943,11 @@ OI
|
||||
OI
|
||||
OI
|
||||
OI
|
||||
ML
|
||||
ML
|
||||
ML
|
||||
ML
|
||||
ML
|
||||
JP
|
||||
Se
|
||||
Se
|
||||
Se
|
||||
PP
|
||||
Ii
|
||||
"}
|
||||
(42,1,1) = {"
|
||||
@@ -1937,9 +1975,9 @@ OI
|
||||
OI
|
||||
OI
|
||||
OI
|
||||
ML
|
||||
ML
|
||||
ML
|
||||
JP
|
||||
Se
|
||||
PP
|
||||
Yw
|
||||
jb
|
||||
gU
|
||||
@@ -1971,7 +2009,7 @@ OI
|
||||
OI
|
||||
OI
|
||||
OI
|
||||
ML
|
||||
KD
|
||||
gU
|
||||
jb
|
||||
gU
|
||||
@@ -2005,7 +2043,7 @@ OI
|
||||
OI
|
||||
OI
|
||||
OI
|
||||
ML
|
||||
KD
|
||||
Ii
|
||||
oi
|
||||
yt
|
||||
|
||||
@@ -46,9 +46,11 @@
|
||||
/obj/structure/cable,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "sorting disposal pipe (Civilan Wing)";
|
||||
sortTypes = list(16,17)
|
||||
name = "sorting disposal pipe (Engineering Wing)"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/general,
|
||||
/turf/open/floor/catwalk_floor,
|
||||
/area/station/maintenance/port/central)
|
||||
"ee" = (
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
/obj/structure/cable,
|
||||
/obj/structure/disposalpipe/sorting/mail{
|
||||
dir = 4;
|
||||
name = "sorting disposal pipe (Civilan Wing)";
|
||||
sortTypes = list(16,17)
|
||||
name = "sorting disposal pipe (Engineering Wing)"
|
||||
},
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics,
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office,
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/general,
|
||||
/turf/open/floor/catwalk_floor,
|
||||
/area/station/maintenance/port/central)
|
||||
"aO" = (
|
||||
|
||||
+1120
-1107
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,33 @@
|
||||
|
||||
#define SORT_TYPE_WASTE 0
|
||||
///All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler.
|
||||
#define SORT_TYPE_DISPOSALS 1
|
||||
#define SORT_TYPE_CARGO_BAY 2
|
||||
#define SORT_TYPE_QM_OFFICE 3
|
||||
#define SORT_TYPE_ENGINEERING 4
|
||||
#define SORT_TYPE_CE_OFFICE 5
|
||||
#define SORT_TYPE_ATMOSPHERICS 6
|
||||
#define SORT_TYPE_SECURITY 7
|
||||
#define SORT_TYPE_HOS_OFFICE 8
|
||||
#define SORT_TYPE_MEDBAY 9
|
||||
#define SORT_TYPE_CMO_OFFICE 10
|
||||
#define SORT_TYPE_CHEMISTRY 11
|
||||
#define SORT_TYPE_RESEARCH 12
|
||||
#define SORT_TYPE_RD_OFFICE 13
|
||||
#define SORT_TYPE_ROBOTICS 14
|
||||
#define SORT_TYPE_HOP_OFFICE 15
|
||||
#define SORT_TYPE_LIBRARY 16
|
||||
#define SORT_TYPE_CHAPEL 17
|
||||
#define SORT_TYPE_THEATER 18
|
||||
#define SORT_TYPE_BAR 19
|
||||
#define SORT_TYPE_KITCHEN 20
|
||||
#define SORT_TYPE_HYDROPONICS 21
|
||||
#define SORT_TYPE_JANITOR_CLOSET 22
|
||||
#define SORT_TYPE_GENETICS 23
|
||||
#define SORT_TYPE_EXPERIMENTOR_LAB 24
|
||||
#define SORT_TYPE_ORDNANCE 25
|
||||
#define SORT_TYPE_DORMITORIES 26
|
||||
#define SORT_TYPE_VIROLOGY 27
|
||||
#define SORT_TYPE_XENOBIOLOGY 28
|
||||
#define SORT_TYPE_LAW_OFFICE 29
|
||||
#define SORT_TYPE_DETECTIVES_OFFICE 30
|
||||
@@ -0,0 +1,124 @@
|
||||
/obj/effect/mapping_helpers/mail_sorting
|
||||
icon_state = "sort_type_helper"
|
||||
late = TRUE
|
||||
var/sort_type = SORT_TYPE_WASTE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/Initialize(mapload)
|
||||
..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/LateInitialize()
|
||||
var/obj/structure/disposalpipe/sorting/mail/mail_sorter = locate(/obj/structure/disposalpipe/sorting/mail) in loc
|
||||
if(mail_sorter)
|
||||
mail_sorter.sortTypes |= sort_type
|
||||
else
|
||||
log_mapping("[src] failed to find a mail sorting disposal pipe at [AREACOORD(src)]")
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply
|
||||
icon_state = "sort_type_helper_sup"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/disposals
|
||||
sort_type = SORT_TYPE_DISPOSALS
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay
|
||||
sort_type = SORT_TYPE_CARGO_BAY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/supply/qm_office
|
||||
sort_type = SORT_TYPE_QM_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering
|
||||
icon_state = "sort_type_helper_eng"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/general
|
||||
sort_type = SORT_TYPE_ENGINEERING
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office
|
||||
sort_type = SORT_TYPE_CE_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics
|
||||
sort_type = SORT_TYPE_ATMOSPHERICS
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/security
|
||||
icon_state = "sort_type_helper_sec"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/security/general
|
||||
sort_type = SORT_TYPE_SECURITY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/security/hos_office
|
||||
sort_type = SORT_TYPE_HOS_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/security/detectives_office
|
||||
sort_type = SORT_TYPE_DETECTIVES_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay
|
||||
icon_state = "sort_type_helper_med"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/general
|
||||
sort_type = SORT_TYPE_MEDBAY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office
|
||||
sort_type = SORT_TYPE_CMO_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry
|
||||
sort_type = SORT_TYPE_CHEMISTRY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/medbay/virology
|
||||
sort_type = SORT_TYPE_VIROLOGY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science
|
||||
icon_state = "sort_type_helper_sci"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/research
|
||||
sort_type = SORT_TYPE_RESEARCH
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/rd_office
|
||||
sort_type = SORT_TYPE_RD_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/robotics
|
||||
sort_type = SORT_TYPE_ROBOTICS
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/genetics
|
||||
sort_type = SORT_TYPE_GENETICS
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab
|
||||
sort_type = SORT_TYPE_EXPERIMENTOR_LAB
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/ordnance
|
||||
sort_type = SORT_TYPE_ORDNANCE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/science/xenobiology
|
||||
sort_type = SORT_TYPE_XENOBIOLOGY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service
|
||||
icon_state = "sort_type_helper_serv"
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/hop_office
|
||||
sort_type = SORT_TYPE_HOP_OFFICE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/library
|
||||
sort_type = SORT_TYPE_LIBRARY
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/chapel
|
||||
sort_type = SORT_TYPE_CHAPEL
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/theater
|
||||
sort_type = SORT_TYPE_THEATER
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/bar
|
||||
sort_type = SORT_TYPE_BAR
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/kitchen
|
||||
sort_type = SORT_TYPE_KITCHEN
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/hydroponics
|
||||
sort_type = SORT_TYPE_HYDROPONICS
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet
|
||||
sort_type = SORT_TYPE_JANITOR_CLOSET
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/dormitories
|
||||
sort_type = SORT_TYPE_DORMITORIES
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/service/law_office
|
||||
sort_type = SORT_TYPE_LAW_OFFICE
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 21 KiB |
@@ -172,6 +172,7 @@
|
||||
#include "code\__DEFINES\sight.dm"
|
||||
#include "code\__DEFINES\skills.dm"
|
||||
#include "code\__DEFINES\song.dm"
|
||||
#include "code\__DEFINES\sort_types.dm"
|
||||
#include "code\__DEFINES\sound.dm"
|
||||
#include "code\__DEFINES\space.dm"
|
||||
#include "code\__DEFINES\spaceman_dmm.dm"
|
||||
@@ -3522,6 +3523,7 @@
|
||||
#include "code\modules\mapfluff\ruins\spaceruin_code\TheDerelict.dm"
|
||||
#include "code\modules\mapfluff\ruins\spaceruin_code\whiteshipruin_box.dm"
|
||||
#include "code\modules\mapping\access_helpers.dm"
|
||||
#include "code\modules\mapping\mail_sorting_helpers.dm"
|
||||
#include "code\modules\mapping\map_template.dm"
|
||||
#include "code\modules\mapping\mapping_helpers.dm"
|
||||
#include "code\modules\mapping\merge_conflicts.dm"
|
||||
|
||||
Reference in New Issue
Block a user