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

Komodo boot and baggage update. #2375

Closed
wants to merge 19 commits into from

Conversation

axelzonvolt
Copy link
Contributor

@axelzonvolt axelzonvolt commented Sep 25, 2023

About The Pull Request

This started as an effort to address the over abundance of jackboots (a filthy nanotrasen product!) in place of the faction neutral combat boot on the syndicate warship.

And then I noticed a misplaced fire extinguisher cabinet in the bar. A broken icon state in the captain's locker. a light tube placed ON a defibrillator wallmount...

Why It's Good For The Game

misplaced, broken or even mispathed objects are awful. This PR addresses quite a lot of that and provides numerous SMALL adjustments to the komodo-class vessel.

for example, this is the armory before I addressed it.

komodobefore

and this is after.

komodoafter

Changelog

🆑
tweak: komodo medbay had the actual and useless cyborg limbs replaced with prosthetics
tweak: light tubes, fire extinguisher cabinets, apc/air alarm placement and light switches have had their relative positioning across the komodo changed for a consistent look and to reduce floating/mapping sins.
fix: armor/vest/security/hos was missing an icon_state path.
fix: changed shoes/jackboot with shoes/combat in the job_types\captain.dm file for the gorlex, cybersun and aclf command subtypes.
tweak: the fax machine on the komodo bridge was switched with the neighboring desk tile and objects that it was preventing easy access to.
/:cl:

@axelzonvolt axelzonvolt requested a review from a team as a code owner September 25, 2023 08:36
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Sep 25, 2023
@thgvr
Copy link
Member

thgvr commented Oct 2, 2023

Can you please clean up the changelog, it doesn't make much sense as is

@axelzonvolt
Copy link
Contributor Author

I... listed what was changed and where.

@Zevotech
Copy link
Contributor

Zevotech commented Oct 6, 2023

I... listed what was changed and where.

what they mean is to specify the changes are to the komodo map. in the big changelog they'll end up looking like general changes.

fax machine's on the wrong tile, fixing that
@axelzonvolt
Copy link
Contributor Author

right. cleaned up the change log and someone pointed out an issue with the fax machine placement. This SHOULD be the final revision for now.

@spockye
Copy link
Contributor

spockye commented Oct 16, 2023

fix checks please!

@axelzonvolt
Copy link
Contributor Author

all checks green across the board after severe prodding.

Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

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

yeah. sorry for the wait. i'll get this TM'd next uptime.

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

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

@Latentish
Copy link
Member

Please fix your merge conflicts so we can tm this.

@axelzonvolt
Copy link
Contributor Author

I am honestly at a loss as to why the github action bot gave it the merge conflict label. 1c94f92 was completely fine. I don't have write access to resolve the conflict and there are no problems on my end when launching it via a private server. VSC and github desktop aren't reporting issues either.

I'm KIND of stuck now...

@axelzonvolt axelzonvolt requested a review from goober3 October 31, 2023 12:51
@thgvr
Copy link
Member

thgvr commented Oct 31, 2023

Hi there,

Your merge conflicts are because the syndicate_gorlex_komodo.dmm file was moved to shuttles/syndicate/syndicate_gorlex_komodo.dmm from shuttles/shiptest/syndicate_gorlex_komodo.dmm. This was done in #2378. If you move it there and commit, it should resolve. It can be confusing because I am almost certain vscode will not alert to this.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 3, 2023
@axelzonvolt
Copy link
Contributor Author

green across the board once more.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 13, 2023
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 Nov 15, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 3, 2023
Copy link
Contributor

github-actions bot commented Dec 3, 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 Dec 5, 2023
Copy link
Contributor

github-actions bot commented Dec 6, 2023

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

@thgvr thgvr closed this Feb 9, 2024
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. Map Change Tile placing is hard. Thank you for your service. Merge Conflict Use Git Hooks, you're welcome.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants