-
Notifications
You must be signed in to change notification settings - Fork 295
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
Shipbreaker map template organization #5533
base: master
Are you sure you want to change the base?
Shipbreaker map template organization #5533
Conversation
Wooo, CI errors, let's go! |
yes this somehow fixes the hard-del, don't ask me how
4c3054c
to
95b6de1
Compare
_maps/~monkestation/shipbreaking
@LikeLakers2 Make sure gorlex cruiser isnt possible to spawn in its too fucking stacked, it should be an emag only ship or something |
@ThePooba The gorlex cruiser map template datum was already commented out - and I did not change this, so it's still commented out. |
me when i accidentally make my ship too fucking cool. uhh nuke the revolver and some of the more excessive loot instead of just disabling |
@Addust I would rather not, as this PR is only about organizing the shipbreaker map templates, and ensuring they follow the linters. |
you may have broken depot shipbreaking |
@Addust Turns out I did. It's fixed now. |
/* | ||
/datum/map_template/shipbreaker/whale | ||
name = "Whale" | ||
template_id = "whale" | ||
description = "Whale-type description" | ||
mappath = "_maps/~monkestation/shipbreaking/whale.dmm" | ||
*/ |
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.
This map template had no datum, so I made a quick and dirty one. However, as I'm unsure if this map template is wanted, I've commenting it out.
About The Pull Request
This PR performs the following tasks on shipbreaker map templates (commits are linked for ease of review):
Moves all shipbreaker maps into the
_maps/~monkestation/shipbreaking
folder, to be consistent with other monke-specific map templates.Condenses all shipbreaker map template datums into one file
Fixes certain shipbreaker map paths that were outright broken
Fixes map linting errors with certain shipbreaker map templates, which were exposed by performing the above tasks. I attempted to do this without affecting loot, and for the most part succeeded - though
mess.dmm
has ever so slightly less bronze to collect now, as I had to remove a wall that was in the same tile as a door.Moves shipbreaker map templates to SSmapping, where many other map templates exist - this incidentally fixes a hard-del issue exposed by the above tasks, too.
Creates a map template datum for
whale.dmm
- though commented out, as I'm unsure if it's wanted.Why It's Good For The Game
Maintenance and organization.
Changelog
Below are the user-facing changes only.
🆑MichiRecRoom
fix: Some shipbreaking templates had invalid map paths, and thus it was possible to get a blank ship - this has been fixed.
fix: If you found that this PR broke shipbreaking during its testmerge phase, you'd be right. That's been fixed.
/:cl: