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

Garrow Modifications 2 #266

Merged
merged 104 commits into from
Sep 5, 2024
Merged

Conversation

DexterDude
Copy link
Contributor

Fixes some issues, namely some layering stuff and some missing pipes, as well as the platco phone category (thanks andro for reminding me)

Also adds some QOL for GMs by giving them some mostly empty cargo bays and more accessible and clear buttons.

Also adds support:tm: for Andro to add elevators. I looked at it and it seemed a little more complicated than normal shuttles, so I figured I'd leave it to the experts. Don't merge before then, please!

@DexterDude
Copy link
Contributor Author

fail...oh my science...

@DexterDude DexterDude marked this pull request as draft May 20, 2024 14:02
Fixes the evil linters issue and also adds more heavy wiring everywhere because it looks cooler. Also adds a podlock accessible southwest that GMs can use to spawn ERTs.
wire cool fix door cool
fixes poster, changes assembly room (now opens by buttons if you arent platco, idk why its cool i guess), moves megaphone to platco quarters, makes tripoli interior more visible, removes mouse opacity on drop pad so loading is easier
Copy link

github-actions bot commented Jun 6, 2024

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

Copy link

github-actions bot commented Jun 7, 2024

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

Just a few things to tidy up. Besides that, code good.

code/datums/shuttles.dm Outdated Show resolved Hide resolved
code/datums/shuttles.dm Outdated Show resolved Hide resolved
code/game/area/shuttles.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/poddoor.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/poddoor.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttles/shipmap_elevator.dm Outdated Show resolved Hide resolved
maps/map_files/golden_arrow/golden_arrow.dmm Outdated Show resolved Hide resolved
Doubleumc
Doubleumc previously approved these changes Sep 5, 2024
Doubleumc
Doubleumc previously approved these changes Sep 5, 2024
@Doubleumc Doubleumc removed do not merge needs tested testmerge this to see what breaks labels Sep 5, 2024
@Doubleumc Doubleumc merged commit b06093f into cmss13-devs:master Sep 5, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants