Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 18bbae7
Author: PowerfulBacon <[email protected]>
Date:   Fri Aug 30 19:49:01 2024 +0100

    Allows disposals to end in delivery office

commit 565af66
Author: PowerfulBacon <[email protected]>
Date:   Fri Aug 30 19:09:53 2024 +0100

    Merges 2 files together

commit 195fa7c
Author: PowerfulBacon <[email protected]>
Date:   Fri Aug 30 18:58:57 2024 +0100

    Adds in mapping helpers for disposals

commit 611dd96
Author: ss13-beebot <[email protected]>
Date:   Fri Aug 30 00:12:46 2024 +0000

    Automatic changelog compile [ci skip]

commit 522552a
Author: ss13-beebot <[email protected]>
Date:   Thu Aug 29 18:03:54 2024 +0000

    Automatic changelog compile [ci skip]

commit 1f5a444
Author: ss13-beebot <[email protected]>
Date:   Thu Aug 29 12:28:03 2024 -0500

    Automatic changelog generation for PR BeeStation#11366 [ci skip]

commit c05a8ee
Author: Rukofamicom <[email protected]>
Date:   Thu Aug 29 12:18:22 2024 -0500

    Gibtonite flashes again (BeeStation#11366)

commit af85a21
Author: ss13-beebot <[email protected]>
Date:   Thu Aug 29 17:03:19 2024 +0000

    Automatic changelog compile [ci skip]

commit 000ed5c
Author: ss13-beebot <[email protected]>
Date:   Thu Aug 29 11:23:27 2024 -0500

    Automatic changelog generation for PR BeeStation#10983 [ci skip]

commit fd1e700
Author: Dejaku51 <[email protected]>
Date:   Thu Aug 29 18:13:47 2024 +0200

    Server framework v2 (BeeStation#10983)

    * i don't remember what is happening

    * much better

    * just debug stuff

    * the ideas are coming

    * that shouldn't be here

    * it works now!

    * RnD servers integrated

    * sparks!

    * no more "if true return true"

    * reverse logic

    * adds ! to comments in stat.dm

    * clean up after yourself on Destroy()

    * splits early return

    * clean up after yourself tcomm monitoring

    * you too all tcomms machines

    * adds type holder instead of GetComponents

    * fix indentation

    * cmon indentation

    * HOW?!

    * oopsie woopsie

    * removes TODO and adds a comment

    * packet types and null on destroy

    * update comment

    * fixed radstation tcomms area + switches hub with blackbox

    * rebalances tcomms heat generation

    * fix echo tcomms cooling

    * that should stop funny exploit discovered by aramix

    * cooldown define

    * remove useless signal

    * opened machine is under maintenance

    * return null instead of 0 points

    * return false

    * I HATE TESTS

commit 79ee753
Author: ss13-beebot <[email protected]>
Date:   Thu Aug 29 00:12:28 2024 +0000

    Automatic changelog compile [ci skip]

commit f4028a7
Author: ss13-beebot <[email protected]>
Date:   Wed Aug 28 16:03:51 2024 +0000

    Automatic changelog compile [ci skip]

commit ded9e05
Author: ss13-beebot <[email protected]>
Date:   Wed Aug 28 10:18:28 2024 -0500

    Automatic changelog generation for PR BeeStation#11373 [ci skip]

commit c95ed70
Author: ClownMoff <[email protected]>
Date:   Wed Aug 28 15:59:25 2024 +0100

    Update cigarette.dm (BeeStation#11373)

commit a251e91
Author: ss13-beebot <[email protected]>
Date:   Wed Aug 28 10:08:53 2024 -0500

    Automatic changelog generation for PR BeeStation#11387 [ci skip]

commit 61b21cc
Author: XeonMations <[email protected]>
Date:   Wed Aug 28 17:58:39 2024 +0300

    Fixes simplemobs being able to interact with machinery (BeeStation#11387)

    * another PR, another banger

    * comment moment

commit 1cf4941
Author: Markus Larsson <[email protected]>
Date:   Tue Aug 27 13:17:12 2024 +0200

    Delta Science Doors Fix (BeeStation#11303)

    * Silly goose didn't use the "txt" var.

    * Update DeltaStation2.dmm

    * Update DeltaStation2.dmm

    * Update DeltaStation2.dmm

commit ceee177
Author: PowerfulBacon <[email protected]>
Date:   Tue Aug 27 11:35:01 2024 +0100

    Boxstation mapping fixes BeeStation#11364 (BeeStation#11368)

    * Fixes 89,129

    * Update BoxStation.dmm

    * Update BoxStation.dmm

    * Camera fixes

    * Adds in an unsorted loop to the boxstation package loop

    * Fixes direction of the sorting pipe

    * Fixes boxstation disposal issues

    * Fixes cameras

    * Fixes multiple objects stacked on top of each other

    * Fixes some lights placed on windows

    * Fixes all boxstation light issues

    * Update BoxStation.dmm

    * Fixes some lights placed on windows

    * Fixes all boxstation light issues

commit 8d8f3f8
Author: ss13-beebot <[email protected]>
Date:   Tue Aug 27 00:12:25 2024 +0000

    Automatic changelog compile [ci skip]

commit ff2162b
Author: ss13-beebot <[email protected]>
Date:   Mon Aug 26 18:11:15 2024 -0500

    Automatic changelog generation for PR BeeStation#11385 [ci skip]

commit d1c6236
Author: XeonMations <[email protected]>
Date:   Tue Aug 27 02:01:44 2024 +0300

    Fuck ups of the year. (BeeStation#11385)
  • Loading branch information
@PowerfulBacon
PowerfulBacon committed Sep 1, 2024
1 parent 781afc1 commit f70e74c
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 117 deletions.
157 changes: 157 additions & 0 deletions code/__DEFINES/pipe_construction.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

117 changes: 0 additions & 117 deletions code/_globalvars/lists/flavor_misc.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") + "")
Expand Down
6 changes: 6 additions & 0 deletions html/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,12 @@ <h3 class="author">rkz, HowToLu/Dakae, PigeonVerde/PestoVerde, Floria/BriggsIDP,
<li class="code_imp">adds zmimic hooks for tiles and material turfs</li>
<li class="balance">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.</li>
</ul>

<h2 class="date">29 June 2024</h2>
<h3 class="author">spockye updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">A couple fland station power cable and disposals fixes</li>
</ul>
</div>

<b>GoonStation 13 Development Team</b>
Expand Down

0 comments on commit f70e74c

Please sign in to comment.