Skip to content

The Split #926

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

Merged
merged 93 commits into from
Jul 20, 2024
Merged

The Split #926

merged 93 commits into from
Jul 20, 2024

Conversation

Kapu1178
Copy link
Member

@Kapu1178 Kapu1178 commented May 2, 2024

wip

Changelog

🆑
/:cl:

Temporary holder for an unapproved proposed change.
Just a small stock. Just in case, now that genetics is dead.
…mastermerge

# Conflicts:
#	_maps/map_files/Theseus/Theseus.dmm
#	code/_compile_options.dm
#	tgui/packages/tgui/interfaces/Cargo.jsx
#	tgui/packages/tgui/interfaces/CargoExpress.jsx
#	tgui/packages/tgui/interfaces/CrewManifest.jsx
#	tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
@Kapu1178 Kapu1178 marked this pull request as ready for review July 20, 2024 00:56
@Kapu1178 Kapu1178 requested a review from francinum as a code owner July 20, 2024 00:56
@Kapu1178
Copy link
Member Author

A loaded god complex, cock it n' pull it

@Kapu1178 Kapu1178 merged commit b996c82 into DaedalusDock:master Jul 20, 2024
13 checks passed
@Kapu1178 Kapu1178 deleted the thesplit branch July 20, 2024 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants