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

Shipbreaker map template organization #5533

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

LikeLakers2
Copy link
Collaborator

@LikeLakers2 LikeLakers2 commented Feb 18, 2025

About The Pull Request

This PR performs the following tasks on shipbreaker map templates (commits are linked for ease of review):

  • 27109cd
    Moves all shipbreaker maps into the _maps/~monkestation/shipbreaking folder, to be consistent with other monke-specific map templates.
  • 8702907
    Condenses all shipbreaker map template datums into one file
  • 59adc29
    Fixes certain shipbreaker map paths that were outright broken
  • 2ce4ab7 df06fde b7b9738 8f0dbcf
    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.
  • 95b6de1 c9638af
    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.
  • 5e0fdc5
    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:

@LikeLakers2 LikeLakers2 added Minor Mapping Fix fix da bug Refactor/Rework Completely redoing a larger thing / recoding a thing labels Feb 18, 2025
@LikeLakers2
Copy link
Collaborator Author

Wooo, CI errors, let's go!

@LikeLakers2 LikeLakers2 marked this pull request as draft February 18, 2025 10:15
@LikeLakers2 LikeLakers2 force-pushed the project/map-sorting/shipbreaking branch from 4c3054c to 95b6de1 Compare February 18, 2025 12:38
@LikeLakers2 LikeLakers2 changed the title Sorts shipbreaker maps into _maps/~monkestation/shipbreaking Shipbreaker map template organization Feb 18, 2025
@LikeLakers2 LikeLakers2 added the Code Improvement exactly what it says on the tin label Feb 18, 2025
@LikeLakers2 LikeLakers2 marked this pull request as ready for review February 18, 2025 12:48
@ThePooba
Copy link
Collaborator

@LikeLakers2 Make sure gorlex cruiser isnt possible to spawn in its too fucking stacked, it should be an emag only ship or something

@LikeLakers2
Copy link
Collaborator Author

LikeLakers2 commented Feb 18, 2025

@ThePooba The gorlex cruiser map template datum was already commented out - and I did not change this, so it's still commented out.

@Addust
Copy link
Contributor

Addust commented Feb 18, 2025

@LikeLakers2 Make sure gorlex cruiser isnt possible to spawn in its too fucking stacked, it should be an emag only ship or something

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

@LikeLakers2
Copy link
Collaborator Author

LikeLakers2 commented Feb 18, 2025

@Addust I would rather not, as this PR is only about organizing the shipbreaker map templates, and ensuring they follow the linters.

@Addust
Copy link
Contributor

Addust commented Feb 19, 2025

you may have broken depot shipbreaking

@LikeLakers2
Copy link
Collaborator Author

@Addust Turns out I did. It's fixed now.

Comment on lines +141 to +147
/*
/datum/map_template/shipbreaker/whale
name = "Whale"
template_id = "whale"
description = "Whale-type description"
mappath = "_maps/~monkestation/shipbreaking/whale.dmm"
*/
Copy link
Collaborator Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement exactly what it says on the tin Fix fix da bug Mapping Minor Refactor/Rework Completely redoing a larger thing / recoding a thing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants