Skip to content

The 76#53

Open
dwinters99 wants to merge 13 commits into
ApocryphaXIII:masterfrom
dwinters99:76
Open

The 76#53
dwinters99 wants to merge 13 commits into
ApocryphaXIII:masterfrom
dwinters99:76

Conversation

@dwinters99
Copy link
Copy Markdown

About The Pull Request

Adds the Ocean 76 gang as jobs and adds map landmarks for them.

Why It's Good For The Game

The Ocean 76 are important to our metaplot.

Changelog

🆑
add: The Ocean 76 gang
/:cl:

@github-actions
Copy link
Copy Markdown

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~7 days. Please address any outstanding review items and ensure your PR is finished - if both are true, and you have auto-staled anyway, you need to actively ask maintainers (by pinging them in the Apocrypha XIII Discord) to (re)review or merge your PR. If no maintainer responds to your request, you may wish to close this PR yourself while you seek maintainer comment, as you will later be able to reopen the PR yourself.

@github-actions github-actions Bot added the Stale label May 24, 2026
@dwinters99 dwinters99 removed the Stale label May 27, 2026
@dwinters99 dwinters99 marked this pull request as ready for review May 27, 2026 22:55
@dwinters99 dwinters99 requested review from a team as code owners May 27, 2026 22:56
Copy link
Copy Markdown
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

linter fail

Hella nits.

const experienceNeeded = data.job_required_experience?.[name];
const daysLeft = data.job_days_left ? data.job_days_left[name] : 0;


Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

non-modular edit lol

Comment thread tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss Outdated
Comment thread code/__DEFINES/~darkpack/jobs.dm Outdated
Comment thread code/__DEFINES/~darkpack/jobs.dm Outdated
Comment on lines +152 to +161
// APOC EDIT ADD START - JOBS - Ocean 76
/* Ocean 76ers */
/obj/effect/landmark/start/darkpack/ocean
name = "generic gang member start"
icon = 'modular_zapoc/modules/jobs/icons/landmarks.dmi'

JOB_START_HELPER(ocean/boss, JOB_OCEAN_76_BOSS)
JOB_START_HELPER(ocean/ganger, JOB_OCEAN_76_GANGER)
// APOC EDIT ADD END

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Guh. That helper should just be put in a define folder so these can go with there module. (upstream issue)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i can make a pr for this later, unless you want that made before this gets merged

dwinters99 and others added 4 commits June 1, 2026 19:53
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants