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.

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

Syndicate-ing #2221

Merged
merged 17 commits into from
Nov 13, 2023
Merged

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

makes all syndicate outfits give their mob a bespoke syndicate faction

Also removes the syndicate lavabase and a bunch of old ghost roles

Why It's Good For The Game

IFF (2028)

and cruft removal

Changelog

🆑
del: the syndicate lavaland base has been removed.
code: syndicate outfits have been repathed. Please report anything weird.

/:cl:

@Erikafox Erikafox requested a review from a team as a code owner July 31, 2023 05:54
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Jul 31, 2023
Copy link
Contributor

Choose a reason for hiding this comment

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

FINALLY
FUCK THIS THING
NO FREE ANTAG

duffelbag = /obj/item/storage/backpack/duffelbag/syndie
courierbag = /obj/item/storage/backpack/messenger/sec

/datum/outfit/job/solgov/post_equip(mob/living/carbon/human/H, visualsOnly)
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't this be syndicate?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yea probably

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2023

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 3, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 4, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 9, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2023

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

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Aug 12, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 6, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 13, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 17, 2023
@Erikafox Erikafox mentioned this pull request Nov 6, 2023
@thgvr thgvr added the Test Merge Candidate You do it for free. label Nov 7, 2023
@thgvr thgvr added this pull request to the merge queue Nov 13, 2023
Merged via the queue into shiptest-ss13:master with commit 4bb948e Nov 13, 2023
10 checks passed
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants