Skyrat-tg icon indicating copy to clipboard operation
Skyrat-tg copied to clipboard

[MDB IGNORE] NuInterlink, or as I like to call it, the Evac Shuttle now docks at the Interlink

Open Jolly-66 opened this issue 2 years ago • 13 comments

About The Pull Request

This PR overhauls the Interlink, as well as removing the evac shuttle from docking at CC. It now docks at the Interlink. And yes, this is my last PR for awhile. I've been on hiatus since earlier in the day.

closes: #15907

Still a work in progress because I wanna do spiffing up (and I didn't delete the old Interlink yet, lol). Also need to test with some of the wacky shuttles because shuttle docks are wacky as fuck (may request a TM since this isn't something I can just do rapid fire).

Small checklist of shit to do:

  • [ ] Make new "CC" area defines
  • [x] Add four smaller dorm rooms
  • [x] Decalening

How This Contributes To The Skyrat Roleplay Experience

Its been an idea from what I've been told, to have the evac shuttle dock at the Interlink. Now thats a reality.

The Interlink is split up into two portions, the Interlink North (where we latejoin spawn into), and the Interlink South (where the Evac shuttle docks).

Interlink North:

Interlink "Arrivals!" It never hurts to reuse old assets when they fit.

image

Longue areas! Ignore the broken paintings. Who uses dirs for directions instead of subtypes :skull:

image

Little cafe!

image

Locker room!

image

Primary garden!

image

Aux garden with a cave (spooky!)

image

Interlink South:

Administration?!

Customary check point.

image

Blueshield Office.

image

NT Consultant Office.

image

Executive meeting room!

image

Evac dock

Main area.

image

Medbay.

image

Library longue! Featuring an adult section.

image

Bar! (Bartenders can bartend here!)

image

Kitchen! (Chefs can cook here!)

image

Evac garden!

image

Changelog

:cl: Jolly add: The Interlink has been overhauled. add: The Evac shuttle now docks at the Interlink at the conclusion of a round. del: The Evac shuttle no longer docks at CC. /:cl:

Jolly-66 avatar Sep 04 '22 00:09 Jolly-66

We also have to check for the greentext objectives for leaving via the escape shuttle to take the Interlink's area into account, but potentially not the North portion.

GoldenAlpharex avatar Sep 05 '22 23:09 GoldenAlpharex

Should be in a "good" state. Just need to make the area define.

Jolly-66 avatar Sep 06 '22 00:09 Jolly-66

What's the point of ever having mapdiff bot if we use mdb ignore on every pr that touches maps

Paxilmaniac avatar Sep 07 '22 21:09 Paxilmaniac

Otherwise, I feel there's some good here but you might get a pr to your branch from me since suggesting map changes here is uh, you know

Paxilmaniac avatar Sep 07 '22 21:09 Paxilmaniac

What's the point of ever having mapdiff bot if we use mdb ignore on every pr that touches maps

Sometimes I don't feel like waking AA ire. I posted screenshots no less so shush.

Jolly-66 avatar Sep 08 '22 10:09 Jolly-66

What's the point of ever having mapdiff bot if we use mdb ignore on every pr that touches maps

Sometimes I don't feel like waking AA ire. I posted screenshots no less so shush.

You put a bunch of loose snips with 0 context, this is next to useless for getting an idea of the new layout.

Also, they are out of date, and are missing important details like the departmental arrows.

Actual Image

RimiNosha avatar Sep 10 '22 20:09 RimiNosha

Onto my actual feedback, though.

The dorms have those awful invincible wall sprites, which also makes them feel clinical. Maybe return the wooden walls the rooms had before?

Nice touch with the window going all the way through to the shuttle from the spawn point, though, that should hopefully reduce the chances of people being unable to find the new shuttle location on the new map!

RimiNosha avatar Sep 10 '22 20:09 RimiNosha

Looks like the decals are overlapping the wrong way around, I assume that was when some of said decals got changed around. image

I'd assume this was an handicapped spot, but I think the decal for the handicapped spot is missing, in this case. image

It appears to be missing a telecommunications relay, too. Either that, or I'm blind and couldn't find it, but it's not working.

For the dorms rooms, first of all, I think the walls should be made of the invincible wood again, instead of being the ugly invisible CentCom walls.

Then, here's a picture of how I'd change stuff: image

Green in this case would be a table with two seats (facing one-another), so that people can still use the room for other purposes than just the bed. The rest is just moving stuff about.

GoldenAlpharex avatar Sep 14 '22 01:09 GoldenAlpharex

I'll come back when I get the time. I'll try to keep the feedback in mind when I get back (and more importantly, reopen the PR)

Jolly-66 avatar Sep 16 '22 20:09 Jolly-66

I'm so fresh you can suck my nads.

Jolly-66 avatar Oct 07 '22 01:10 Jolly-66

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 ~ 5 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself.

github-actions[bot] avatar Oct 16 '22 00:10 github-actions[bot]

epic fight between github actions and jolly livestreamed on liveleak

Paxilmaniac avatar Oct 24 '22 02:10 Paxilmaniac

I am INCREDIBLY TIRED and FULL OF ANATOMY AND PHYSIOLOGY (and molecular biology but we don't talk about him)

Jolly-66 avatar Oct 24 '22 02:10 Jolly-66

cutely gives you merge conflicts

Paxilmaniac avatar Oct 31 '22 09:10 Paxilmaniac

/atom/proc/onCentCom() should be adjusted as it's currently hardwired to check if you're either on a transitting shuttle, or specifically a subtype of /area/centcom and I wouldn't want greentext to get busted from this.

Edit: Nevermind, I just noticed the interlink area is a subtype of /area/centcom so I think it would work. Might have problems with people using the interlink early to avoid the gameloop but that might be more of an administration problem.

Tastyfish avatar Nov 01 '22 05:11 Tastyfish

The exit lines don't match up with the current default shuttle

The addition of caves is kind of weird and doesn't make the most sense to me, but I guess it's harmless

The telecomms machine probably shouldn't be near/adjacent to any of the dorms, or else you're going to drive people crazy with the buzzing noise.

People in theory could cut through the fences without issue, and get to the exit dock from the arrivals area.

YakumoChen avatar Nov 02 '22 02:11 YakumoChen

The fax machines on the interlink are unnamed, as well as the shutter button for the bar controls the wrong shutters, and the actual shutter button for the bar is underneath one of the shutters on the bar

SomeRandomOwl avatar Nov 15 '22 20:11 SomeRandomOwl

The fax machine should probably just be removed to not be confused with the upcoming ability to fax to CC (admins) via this PR https://github.com/tgstation/tgstation/pull/71129

Tastyfish avatar Nov 15 '22 20:11 Tastyfish