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

ports lazy templates, uses them for ert stations. distress beacons now start in transit to the ship, and return to their very own ert home #5802

Merged
merged 24 commits into from
Mar 4, 2024

Conversation

harryob
Copy link
Member

@harryob harryob commented Feb 24, 2024

title pretty much

actually uses the maps added back in #3546

the lazy templates are made entirely by ZephyrTFA on /tg/, predominantly in tgstation/tgstation#71785

🆑 ZephyrTFA, harryob
add: framework for new ert stations ported from tgstation/tgstation#71785, by ZephyrTFA
add: distress beacons now start in transit to the ship, and will return to their own home base. they can't keep going back and forth between the ship and their base
/:cl:

this pr also unfucks base lighting, because i apparently did that really bad in #4229

@github-actions github-actions bot added Mapping did you remember to save in tgm format? UI deletes nanoui/html Feature Feature coder badge labels Feb 24, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

damn this mapping so fire who did tht!!!??

lgtm!

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 24, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mappingegg

maps/templates/lazy_templates/freelancer_ert_station.dmm Outdated Show resolved Hide resolved
cm13-github added a commit that referenced this pull request Mar 1, 2024
cm13-github added a commit that referenced this pull request Mar 1, 2024
cm13-github added a commit that referenced this pull request Mar 1, 2024
cm13-github added a commit that referenced this pull request Mar 1, 2024
cm13-github added a commit that referenced this pull request Mar 1, 2024
cm13-github added a commit that referenced this pull request Mar 2, 2024
cm13-github added a commit that referenced this pull request Mar 3, 2024
cm13-github added a commit that referenced this pull request Mar 3, 2024
cm13-github added a commit that referenced this pull request Mar 3, 2024
@Drulikar
Copy link
Contributor

Drulikar commented Mar 4, 2024

Also this has been a debug message on master some time; but I am not exactly sure it even is a problem.
WARNING: Template shuttle Boarding Shuttle cannot dock at Response Station Landing Pad 5 2 (width too large). in code/controllers/subsystem/shuttles.dm at line 402 src: Shuttle usr: .
Other than the TWE that needed a shuttle ID, I could not seem to replicate any issue prompting that debug message with any of the ert bases.

@Drulikar Drulikar marked this pull request as draft March 4, 2024 07:34
@harryob harryob marked this pull request as ready for review March 4, 2024 10:50
@Drulikar Drulikar added this pull request to the merge queue Mar 4, 2024
Merged via the queue into cmss13-devs:master with commit 0c3c205 Mar 4, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants