diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 41b21e5989189..609e3d8328f0f 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -30,3 +30,160 @@ #define STATION_TUBE_OPENING 1 #define STATION_TUBE_CLOSED 2 #define STATION_TUBE_CLOSING 3 + +// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to +// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages +// tagged for the Cargo Bay. + +/* List of sortType codes for mapping reference +0 Waste +1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler. +2 Cargo Bay +3 QM Office +4 Engineering +5 CE Office +6 Atmospherics +7 Security +8 HoS Office +9 Medbay +10 CMO Office +11 Chemistry +12 Research +13 RD Office +14 Robotics +15 HoP Office +16 Library +17 Chapel +18 Theatre +19 Bar +20 Kitchen +21 Hydroponics +22 Janitor +23 Genetics +24 Testing Range +25 Toxins +26 Dormitories +27 Virology +28 Xenobiology +29 Law Office +30 Detective's Office +*/ + +//The whole system for the sorttype var is determined based on the order of this list, +//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude + +//If you don't want to fuck up disposals, add to this list, and don't change the order. +//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete + +GLOBAL_LIST_INIT(TAGGERLOCATIONS, list( + "Disposals", + "Cargo Bay", + "QM Office", + "Engineering", + "CE Office", + "Atmospherics", + "Security", + "HoS Office", + "Medbay", + "CMO Office", + "Chemistry", + "Research", + "RD Office", + "Robotics", + "HoP Office", + "Library", + "Chapel", + "Theatre", + "Bar", + "Kitchen", + "Hydroponics", + "Janitor Closet", + "Genetics", + "Testing Range", + "Toxins", + "Dormitories", + "Virology", + "Xenobiology", + "Law Office", + "Detective's Office", +)) + +#define MAPPING_HELPER_SORT(name, sort_code) /obj/structure/disposalpipe/sorting/mail/destination/##name {\ + sortType = sort_code;\ +}\ +/obj/structure/disposalpipe/sorting/mail/destination/##name/flip {\ + flip_type = /obj/structure/disposalpipe/sorting/mail;\ + icon_state = "pipe-j2s";\ + initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP;\ +} + +MAPPING_HELPER_SORT(disposals, 1) +MAPPING_HELPER_SORT(cargo_bay, 2) +MAPPING_HELPER_SORT(qm_office, 3) +MAPPING_HELPER_SORT(engineering, 4) +MAPPING_HELPER_SORT(ce_office, 5) +MAPPING_HELPER_SORT(atmospherics, 6) +MAPPING_HELPER_SORT(security, 7) +MAPPING_HELPER_SORT(hos_office, 8) +MAPPING_HELPER_SORT(medbay, 9) +MAPPING_HELPER_SORT(cmo_office, 10) +MAPPING_HELPER_SORT(chemistry, 11) +MAPPING_HELPER_SORT(research, 12) +MAPPING_HELPER_SORT(rd_office, 13) +MAPPING_HELPER_SORT(robotics, 14) +MAPPING_HELPER_SORT(hop_office, 15) +MAPPING_HELPER_SORT(library, 16) +MAPPING_HELPER_SORT(chapel, 17) +MAPPING_HELPER_SORT(threatre, 18) +MAPPING_HELPER_SORT(bar, 19) +MAPPING_HELPER_SORT(kitchen, 20) +MAPPING_HELPER_SORT(hydroponics, 21) +MAPPING_HELPER_SORT(janitor_closet, 22) +MAPPING_HELPER_SORT(genetics, 23) +MAPPING_HELPER_SORT(testing_range, 24) +MAPPING_HELPER_SORT(toxins, 25) +MAPPING_HELPER_SORT(dormitories, 26) +MAPPING_HELPER_SORT(virology, 27) +MAPPING_HELPER_SORT(xenobiology, 28) +MAPPING_HELPER_SORT(law_office, 29) +MAPPING_HELPER_SORT(detective_office, 30) + +#undef MAPPING_HELPER_SORT + +#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) + +GLOBAL_LIST_INIT(tagger_destination_areas, list( + "Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting), + "Cargo Bay" = list(/area/quartermaster), + "QM Office" = list(/area/quartermaster/qm, /area/quartermaster/qm_bedroom), + "Engineering" = list(/area/engine, /area/engineering), + "CE Office" = list(/area/crew_quarters/heads/chief), + "Atmospherics" = list(/area/engine/atmos, /area/engine/atmospherics_engine), + "Security" = list(/area/security), + "HoS Office" = list(/area/crew_quarters/heads/hos), + "Medbay" = list(/area/medical), + "CMO Office" = list(/area/crew_quarters/heads/cmo), + "Chemistry" = list(/area/medical/chemistry, /area/medical/apothecary), + "Research" = list(/area/science), + "RD Office" = list(/area/crew_quarters/heads/hor), + "Robotics" = list(/area/science/robotics), + "HoP Office" = list(/area/crew_quarters/heads/hop), + "Library" = list(/area/library), + "Chapel" = list(/area/chapel), + "Theatre" = list(/area/crew_quarters/theatre), + "Bar" = list(/area/crew_quarters/bar), + "Kitchen" = list(/area/crew_quarters/kitchen), + "Hydroponics" = list(/area/hydroponics), + "Janitor Closet" = list(/area/janitor), + "Genetics" = list(/area/medical/genetics), + "Testing Range" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), + "Toxins" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), + "Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms), + "Virology" = list(/area/medical/virology), + "Xenobiology" = list(/area/science/xenobiology), + "Law Office" = list(/area/lawoffice), + "Detective's Office" = list(/area/security/detectives_office), +)) + +#endif + diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 5299a7fec827c..ad4f498bb79f4 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -234,123 +234,6 @@ GLOBAL_LIST_INIT(scarySounds, list( 'sound/weapons/thudswoosh.ogg', )) - -// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to -// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages -// tagged for the Cargo Bay. - -/* List of sortType codes for mapping reference -0 Waste -1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler. -2 Cargo Bay -3 QM Office -4 Engineering -5 CE Office -6 Atmospherics -7 Security -8 HoS Office -9 Medbay -10 CMO Office -11 Chemistry -12 Research -13 RD Office -14 Robotics -15 HoP Office -16 Library -17 Chapel -18 Theatre -19 Bar -20 Kitchen -21 Hydroponics -22 Janitor -23 Genetics -24 Testing Range -25 Toxins -26 Dormitories -27 Virology -28 Xenobiology -29 Law Office -30 Detective's Office -*/ - -//The whole system for the sorttype var is determined based on the order of this list, -//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude - -//If you don't want to fuck up disposals, add to this list, and don't change the order. -//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete - -GLOBAL_LIST_INIT(TAGGERLOCATIONS, list( - "Disposals", - "Cargo Bay", - "QM Office", - "Engineering", - "CE Office", - "Atmospherics", - "Security", - "HoS Office", - "Medbay", - "CMO Office", - "Chemistry", - "Research", - "RD Office", - "Robotics", - "HoP Office", - "Library", - "Chapel", - "Theatre", - "Bar", - "Kitchen", - "Hydroponics", - "Janitor Closet", - "Genetics", - "Testing Range", - "Toxins", - "Dormitories", - "Virology", - "Xenobiology", - "Law Office", - "Detective's Office", -)) - -#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) - -GLOBAL_LIST_INIT(tagger_destination_areas, list( - // Disposals is special because it is for anything that doesn't have a tag, so we - // send it to either of these locations - "Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting), - "Cargo Bay" = list(/area/quartermaster), - "QM Office" = list(/area/quartermaster/qm, /area/quartermaster/qm_bedroom), - "Engineering" = list(/area/engine, /area/engineering), - "CE Office" = list(/area/crew_quarters/heads/chief), - "Atmospherics" = list(/area/engine/atmos, /area/engine/atmospherics_engine), - "Security" = list(/area/security), - "HoS Office" = list(/area/crew_quarters/heads/hos), - "Medbay" = list(/area/medical), - "CMO Office" = list(/area/crew_quarters/heads/cmo), - "Chemistry" = list(/area/medical/chemistry, /area/medical/apothecary), - "Research" = list(/area/science), - "RD Office" = list(/area/crew_quarters/heads/hor), - "Robotics" = list(/area/science/robotics), - "HoP Office" = list(/area/crew_quarters/heads/hop), - "Library" = list(/area/library), - "Chapel" = list(/area/chapel), - "Theatre" = list(/area/crew_quarters/theatre), - "Bar" = list(/area/crew_quarters/bar), - "Kitchen" = list(/area/crew_quarters/kitchen), - "Hydroponics" = list(/area/hydroponics), - "Janitor Closet" = list(/area/janitor), - "Genetics" = list(/area/medical/genetics), - "Testing Range" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), - "Toxins" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), - "Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms), - "Virology" = list(/area/medical/virology), - "Xenobiology" = list(/area/science/xenobiology), - "Law Office" = list(/area/lawoffice), - "Detective's Office" = list(/area/security/detectives_office), -)) - -#endif - GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "") GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt") + "") diff --git a/html/changelog.html b/html/changelog.html index ee03e5010776c..111050a4d2e8c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -890,6 +890,12 @@

rkz, HowToLu/Dakae, PigeonVerde/PestoVerde, Floria/BriggsIDP,
  • adds zmimic hooks for tiles and material turfs
  • Medium buff to floor bot logic making them more discerning when repairing or placing tiles. They will now also actually repair tiles instead of always replacing them, if possible.
    • + +

    29 June 2024

    +

    spockye updated:

    + GoonStation 13 Development Team