-
Notifications
You must be signed in to change notification settings - Fork 90
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
Core #457
Core #457
Conversation
Co-authored-by: FoxxoTrystan <[email protected]>
RSI Diff Bot; head commit 2a74391 merging into ac42961 Resources/Textures/Floof/Mobs/Silicon/quad.rsi
Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove all others changes and keep the Core changes.
This PR Contain your secmodule changes and if this is need to be merged its needs to be cleaned up.
has test fails without changes, don't know what you mean by putting it under "required" I made this branch off of the shotgun branch, and the shotgun branch off the secmodules 2 branch, if you merge them in that order, secmodules 2, shotgun, then core, there will be no isssues. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Description
Moved the chapel, added legal, moved mantis, chaplain and cataloguer, added medical Borgs, added a pool and shower area, added a designated direct valve from distro for sm, added station anchor, added TEG, added a secret door to access weh room, added another set of power stations, added a corpsman office and role, added another cadet role and locker, added the prize counter to the arcade, added 2 Qborg modules to the armory, Added an energy shotgun to the HOS locker, added more meteor shields to the outer hull segments south east, and removed the set of cursed bluespace lockers.
Changelog
🆑