Modernizes the Komodo #2701
Merged
Modernizes the Komodo #2701
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Merge Conflict
|
oh, look. merge conflicts. i'll fix this tomorrow. |
github-actions
bot
added
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
wawa |
Latentish
approved these changes
Apr 7, 2024
There was a problem hiding this comment.
Tested this on live, don't see any immediate issues with it. The Komodo is still in this awkward place of being our only Hardsliner ship without proper hardliner representation. Which is to say we need a new hardliner ship. So whenever that happens this will need another pass over. But for not this is good.
|
Waiting for some more changes before a merge as requested. |
|
Mergathons. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 12, 2024
## To-do - [x] Rotate the Komodo - [x] Armory Nerf - [x] Medical Nerf ## About The Pull Request This PR: - Fixes various issues with stacked and floating wallmounts on the Komodo. - Adds a refueling system for the plasma and air tanks. - Nerfs the power generators. - Removes the ORM. - Moves light switches to more convenient locations. - Removes the NanoMed and re-organises medical slightly. - Removes the Bulldog, SRM pistol, Syndicate Derringer, and Infiltrator Rifle. - Adds a Stechkin and 357. Revolver for the Sergeant and Captain, respectively. - Removes the Security RnD kit. - Trims the Bartender's locker slightly, including the shotgun, which they had for some reason. - Adds a Peacekeeping locker to the armory. - Removes the engineering vendor. - Gets a little silly with it. ## Screenshots    ## Changelog 🆑 tweak: The Komodo has been tweaked, including some nerfs and wallmount fixes. /🆑
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 15, 2024
## To-do - [x] Rotate the Komodo - [x] Armory Nerf - [x] Medical Nerf ## About The Pull Request This PR: - Fixes various issues with stacked and floating wallmounts on the Komodo. - Adds a refueling system for the plasma and air tanks. - Nerfs the power generators. - Removes the ORM. - Moves light switches to more convenient locations. - Removes the NanoMed and re-organises medical slightly. - Removes the Bulldog, SRM pistol, Syndicate Derringer, and Infiltrator Rifle. - Adds a Stechkin and 357. Revolver for the Sergeant and Captain, respectively. - Removes the Security RnD kit. - Trims the Bartender's locker slightly, including the shotgun, which they had for some reason. - Adds a Peacekeeping locker to the armory. - Removes the engineering vendor. - Gets a little silly with it. ## Screenshots    ## Changelog 🆑 tweak: The Komodo has been tweaked, including some nerfs and wallmount fixes. /🆑
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To-do
About The Pull Request
This PR:
Screenshots
Changelog
🆑
tweak: The Komodo has been tweaked, including some nerfs and wallmount fixes.
/🆑