Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Port] Departmental Refactor #11209

Merged
merged 9 commits into from
Sep 20, 2024
Merged

[Port] Departmental Refactor #11209

merged 9 commits into from
Sep 20, 2024

Conversation

XeonMations
Copy link
Contributor

@XeonMations XeonMations commented Jul 18, 2024 •
edited
Loading

About The Pull Request

Makes department code into a subsystem, dehardcoding stuff along the way

Partially ports @EvilDragonfiend's:

Why It's Good For The Game

Refactors for the better are good, allows for future PRs and less headaches down the line

Testing Photographs and Procedure

Screenshots&Videos

image

image

Changelog

🆑 EvilDragon, XeonMations
refactor: Refactored departmental code, making it nicer (hopefully)
/:cl:

@XeonMations XeonMations changed the title [Port] Job Refactor [Port] Departmental Refactor Jul 18, 2024
@XeonMations XeonMations mentioned this pull request Jul 18, 2024
Closed
@EvilDragonfiend
Copy link
Member

EvilDragonfiend commented Jul 18, 2024 •
edited
Loading

I will review this first. other maints don't have to waste their time to review before it's fully ready.
(and note that it won't be merged with my approval alone.)

@EvilDragonfiend EvilDragonfiend added the Don't review yet Reviewing this at this stage would be a waste of time. label Jul 18, 2024
@Tsar-Salat
Copy link
Contributor

I will review this first

is there a status on this? It is needed for modsuits

@EvilDragonfiend
Copy link
Member

I will review this first

is there a status on this? It is needed for modsuits

I am editing his PR by myself. I will manage it within a week.

@XeonMations
Merge remote-tracking branch 'upstream/master' into department-refactor
53c6d9b
@XeonMations
Squashed commit of the following:
6e0247c 
commit feb4830
Author: Evildragon <[email protected]>
Date:   Mon Aug 12 19:18:41 2024 +0900

    squashed

commit 3995bb6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 30 00:12:18 2024 +0000

    Automatic changelog compile [ci skip]

commit bfa45eb
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 13:06:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 4718a84
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 07:20:21 2024 -0500

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

commit 25bba7d
Author: spockye <[email protected]>
Date:   Mon Jul 29 14:10:09 2024 +0200

    fixes missing wall (BeeStation#11246)

commit 75fed78
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 00:12:20 2024 +0000

    Automatic changelog compile [ci skip]

commit ad07e7c
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 23:03:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 3a20888
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 17:07:12 2024 -0500

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

commit 1c7a624
Author: spockye <[email protected]>
Date:   Sun Jul 28 23:57:54 2024 +0200

    removes holopad from glass floor on corg (BeeStation#11245)

    * removes holopad from glass floor

    * replaced glass floor with holopad

commit 384db43
Author: BeeBot <[email protected]>
Date:   Sun Jul 28 16:48:45 2024 -0500

    Update TGS DMAPI (BeeStation#11232)

commit fa030d5
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 00:13:22 2024 +0000

    Automatic changelog compile [ci skip]

commit 1aba55e
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 21:03:32 2024 +0000

    Automatic changelog compile [ci skip]

commit fc224ac
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:17:35 2024 -0500

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

commit 7d5399c
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:19 2024 +0200

    [PORT] ports the shark plushie (BeeStation#11235)

    * ports shark plushie from TG

    * adds the plush to the choice beacon

    * oops

    adds a comma

    * Pigeon Variation Package: moodlet, better icon and spawners

    ---------

    Co-authored-by: PigeonVerde322 <[email protected]>

commit 3a18dca
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:07:48 2024 -0500

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

commit 32b1ae2
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:08 2024 +0200

    simply ports better cone sprites (BeeStation#11237)

commit f2841a9
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 00:11:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 1f3df7e
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 16:03:54 2024 +0000

    Automatic changelog compile [ci skip]

commit 7314954
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 10:16:56 2024 -0500

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

commit a1c9962
Author: Markus Larsson <[email protected]>
Date:   Fri Jul 26 17:07:21 2024 +0200

    Prevents Free Range Intercoms from Accessing Syndicate and CentCom Radio Channels (BeeStation#11231)

    * Update radio.dm

    * Update radio.dm

commit daf7f99
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 13:04:56 2024 +0000

    Automatic changelog compile [ci skip]

commit f56e6e4
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:55:51 2024 -0500

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

commit 45bfa98
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:42:09 2024 +0300

    Adds the ability to craft different types of lockers. (BeeStation#11213)

    * done

    * done

commit 08a6811
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:46:25 2024 -0500

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

commit 57f99c4
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:36:50 2024 +0300

    Fixed space dragon's gust ability hitting people through walls (BeeStation#11121)

    * Update space_dragon.dm

    * stuffs

    * Update space_dragon.dm

commit 01d39bc
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 00:11:45 2024 +0000

    Automatic changelog compile [ci skip]

commit 98ecd3c
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 25 01:29:46 2024 +0000

    Automatic changelog compile [ci skip]

commit 1514cd2
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 20:12:13 2024 -0500

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

commit 6b40f76
Author: XeonMations <[email protected]>
Date:   Thu Jul 25 04:02:28 2024 +0300

    no more bugs (BeeStation#11217)

commit 4eb2ffa
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 04:03:49 2024 +0000

    Automatic changelog compile [ci skip]

commit 7f5c69b
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 22:35:43 2024 -0500

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

commit 4c30a59
Author: Rukofamicom <[email protected]>
Date:   Tue Jul 23 22:26:01 2024 -0500

    Revert "Pirate shuttle rebalancing and update (BeeStation#11221)" (BeeStation#11228)

    This reverts commit 00c836b.

commit dcecb26
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 00:12:56 2024 +0000

    Automatic changelog compile [ci skip]

commit 25e2ea9
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 23:04:03 2024 +0000

    Automatic changelog compile [ci skip]

commit 7c497d2
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:06:20 2024 -0500

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

commit d0359b6
Author: Tsar-Salat <[email protected]>
Date:   Tue Jul 23 17:56:51 2024 -0400

    MetaSec brig retiling (BeeStation#11182)

    * nice

    * oops

    * redoes armoury / storage and gear room decalling

    * oops

    fixed a floor decal

    * more small decal changes to offices and sec

    ---------

    Co-authored-by: spockye <[email protected]>

commit 51fb123
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:03:16 2024 +0000

    Automatic changelog compile [ci skip]

commit 8e7dc53
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 11:18:59 2024 -0500

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

commit f427c3a
Author: Geatish <[email protected]>
Date:   Tue Jul 23 18:09:06 2024 +0200

    Small Radstation atmos fix and changes take 2 (BeeStation#11220)

    * rad atmos dep fix

    Rerouted distro piping around the designated work area, also removed the unremovable glass floor from there.
    Finally fixed the atmosphereic shutters not being openable.

    * Fixes small things around gas miners

    Fixed: Removed plating between the eastern miners and atmos. Fixed plasma glass tiles on gas chambers spawning with N2, making them contaminate the gas chamber if you were to remove the glass.

    * I hate maints I hate maints I hate maints

    also removed the extra apc in xeno.

    * Empty commit

    Just dirt

    * god i pray

    guhh

    * The apc was added again???

    how?

    * added back a window

    whoops

    * Now it was too many windows

    smh, better be fucking done now

    ---------

    Co-authored-by: HowToLoLu <[email protected]>

commit d7cd6e6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 16:04:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 8ee0c29
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 10:59:17 2024 -0500

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

commit 7348c94
Author: spockye <[email protected]>
Date:   Tue Jul 23 17:49:43 2024 +0200

    small fix for cameras on explo shuttle (BeeStation#11225)

commit c319bc0
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 00:12:12 2024 +0000

    Automatic changelog compile [ci skip]

commit af9e370
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 08:04:39 2024 +0000

    Automatic changelog compile [ci skip]

commit a6b490c
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 02:25:07 2024 -0500

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

commit 85300f2
Author: spockye <[email protected]>
Date:   Mon Jul 22 09:15:31 2024 +0200

    Pirate shuttle rebalancing and update (BeeStation#11221)

    * tones down decalling and supplies

    * Update pirate_default.dmm

commit fb21ec8
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 01:30:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 95b4254
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 20:15:49 2024 -0500

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

commit 57fff7a
Author: ClownMoff <[email protected]>
Date:   Mon Jul 22 02:06:12 2024 +0100

    Fixes the bananium sword causing bleed (BeeStation#11211)

    * henk

    * Update clown_weapons.dm

commit 50f1640
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 00:13:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 6cae2a6
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 20 00:11:40 2024 +0000

    Automatic changelog compile [ci skip]

commit e72bb00
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 12:04:44 2024 +0000

    Automatic changelog compile [ci skip]

commit 947433a
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 06:35:45 2024 -0500

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

commit 7da94eb
Author: Aramix <[email protected]>
Date:   Fri Jul 19 14:26:18 2024 +0300

    added divable var to closet and its logic (BeeStation#11208)

commit af034cd
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 00:12:42 2024 +0000

    Automatic changelog compile [ci skip]

commit 286b02e
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 17:03:21 2024 +0000

    Automatic changelog compile [ci skip]

commit 3dcaaa4
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:40:19 2024 -0500

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

commit b40c9a0
Author: ToasterBan <[email protected]>
Date:   Thu Jul 18 18:23:16 2024 +0200

    Baton shove now requires disarm intent (BeeStation#11187)

    * tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm

    * Revert "tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm"

    This reverts commit ac7814c.

commit aabea95
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:30:39 2024 -0500

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

commit 1040e75
Author: Hardly3D <[email protected]>
Date:   Thu Jul 18 13:20:52 2024 -0300

    New Hairstyle: Short Bangs 2 (BeeStation#11175)

    * Adds short bangs 2

    * Consistency fix
@XeonMations
Copy link
Contributor Author

To do:

Fix being able to set assistant to yes and a second role to high

@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Tsar-Salat
Copy link
Contributor

I will manage it within a week.

👀

@EvilDragonfiend
Copy link
Member

If it has everything that your job refactor PR needs, it might be fine to go. To check that, checkout this to your job refactor PR will work.

@XeonMations XeonMations marked this pull request as ready for review August 26, 2024 23:40
@XeonMations XeonMations requested a review from itsmeow as a code owner August 26, 2024 23:40
@XeonMations
Copy link
Contributor Author

about damn time

@EvilDragonfiend EvilDragonfiend removed the Don't review yet Reviewing this at this stage would be a waste of time. label Sep 1, 2024
@EvilDragonfiend
Copy link
Member

It's okayish to review now

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@XeonMations XeonMations closed this Sep 8, 2024
@XeonMations XeonMations reopened this Sep 8, 2024
PowerfulBacon
PowerfulBacon approved these changes Sep 20, 2024
View reviewed changes
Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine, datumisation in this way is a solid improvement over random defines scattered around

@PowerfulBacon
Copy link
Member

Kind of disappointed that this still fetches the departments by a string value and not by their typepath, but it otherwise seems like a general improvement and isn't worse than what we had already.

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 20, 2024
Merged via the queue into BeeStation:master with commit 5b3199e Sep 20, 2024
26 checks passed
@XeonMations XeonMations deleted the department-refactor branch September 20, 2024 21:40
@PowerfulBacon PowerfulBacon mentioned this pull request Sep 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PowerfulBacon PowerfulBacon PowerfulBacon approved these changes

@itsmeow itsmeow Awaiting requested review from itsmeow itsmeow is a code owner

Assignees
No one assigned
Labels
Administration Code Improvement Refactor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@XeonMations @EvilDragonfiend @Tsar-Salat @PowerfulBacon