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.

Sign up for GitHub

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

Jump to bottom

Uninclude corporate modpack from core code, fix misc. pathing/side-override bugs #4679

Merged
merged 5 commits into from
Dec 28, 2024
Merged

Uninclude corporate modpack from core code, fix misc. pathing/side-override bugs #4679

merged 5 commits into from
Dec 28, 2024

Conversation

out-of-phaze
Copy link
Member

Description of changes

  • Fixes all maps having the corporate modpack.
    • Moves oldpod ruin into the corporate modpack.
    • Moves hacked headsets into core code.
    • Adds a corporate modpack specific override for random spawner loot.
  • Fixes core code not compiling without the core modpack. (TORCH 2 OH NOOO)
  • Makes the example map fail CI if it detects modpacks have been loaded.
  • Fixes a bunch of mistyped/mispathed proc overrides.

Why and what will this PR improve

Issues found via the Dreamchecker redefined_procs lint. It's disabled in Nebula CI because we use a lot of those for legitimate reasons, including modpacks—so instead we (aka I) periodically audit the results of that lint to find issues to fix.

Authorship

Me

@out-of-phaze out-of-phaze added the ready for review This PR is ready for review and merge. label Dec 27, 2024
@out-of-phaze out-of-phaze mentioned this pull request Dec 27, 2024
Merged
MistakeNot4892
MistakeNot4892 reviewed Dec 27, 2024
View reviewed changes
code/modules/random_map/drop/drop_types.dm
@@ -51,18 +51,6 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/gun/projectile/automatic/smg,
/obj/item/gun/projectile/automatic/assault_rifle)

/datum/supply_drop_loot/ballistics
Copy link
Contributor

Choose a reason for hiding this comment

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

Note to self to turn this type into a /decl.

@MistakeNot4892
Copy link
Contributor

Looks good, will approve with CI working.

@MistakeNot4892 MistakeNot4892 merged commit aab6ba6 into NebulaSS13:staging Dec 28, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MistakeNot4892 MistakeNot4892 MistakeNot4892 approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@out-of-phaze @MistakeNot4892