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

Core #457

Closed
wants to merge 53 commits into from
Closed

Core #457

wants to merge 53 commits into from

Conversation

fenndragon
Copy link
Contributor

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

🆑

  • tweak: Tweaked core

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jan 5, 2025
Copy link
Contributor

github-actions bot commented Jan 5, 2025

RSI Diff Bot; head commit 2a74391 merging into ac42961
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Mobs/Silicon/quad.rsi

State Old New Status
quadsprite Modified
quadspriteCC Added

Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi

State Old New Status
borg_chest+o Added
borg_head+o Added
borg_l_arm+o Added
borg_l_leg+o Added
borg_r_arm+o Added
borg_r_leg+o Added
quad_suit Added

Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi

State Old New Status
base Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Edit: diff updated after 2a74391

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a 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.

@fenndragon
Copy link
Contributor Author

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.

Copy link
Contributor

github-actions bot commented Jan 6, 2025

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

@fenndragon fenndragon reopened this Jan 6, 2025
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 6, 2025
@fenndragon fenndragon closed this Jan 6, 2025
@fenndragon fenndragon deleted the core branch January 8, 2025 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants