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

BoxStation Areas Reworks and Fixes #11219

Merged
merged 39 commits into from
Sep 5, 2024

Conversation

ClownMoff
Copy link
Contributor

@ClownMoff ClownMoff commented Jul 21, 2024

About The Pull Request

Reworks and fixes some outdated Box shenanigans:

Second attempt of #10942

Why It's Good For The Game

BoxStation is old and clunky

Testing Photographs and Procedure

Screenshots&Videos

Changelog

🆑 Varo, Bombyy, PigeonVerde
tweak: BoxStation: Reworked the service area and maintenance
tweak: BoxStation: Reworked the medbay area and maintenance
add: BoxStation: a room for the psychiatrist in medbay
tweak: BoxStation: fixed chaplain backroom having a weird shape
add: BoxStation: Added a new area, apc and air alarm for the captain room
fix: BoxStation: Fixes floating cameras and doble pipes and cables errors
fix: BoxStation: Fixes stools directions and types
/:cl:

@ClownMoff ClownMoff requested a review from a team as a code owner July 21, 2024 01:25
@github-actions github-actions bot added the Mapping DMM Change label Jul 21, 2024
@Fronsis
Copy link

Fronsis commented Jul 21, 2024

Morgue might need the external door into the hallways for Cooks/Dets/Chaplain IMO

I feel like Chef might not have enough space in a table, the advantage of the current Box Kitchen is that more or less you can juggle around having an area for ingredients, raw stuff and finished products for exposure to the crew(if you don't choose to put everything on the main counter) with your new one i feel like everything would be too messy, other than that looks good!

@ClownMoff
Copy link
Contributor Author

ClownMoff commented Jul 21, 2024

Morgue might need the external door into the hallways for Cooks/Dets/Chaplain IMO

If you think about it, why would a station have the room where they put corpses with a door facing the open public

@Fronsis
Copy link

Fronsis commented Jul 21, 2024

Morgue might need the external door into the hallways for Cooks/Dets/Chaplain IMO

If you think about it, why would a station have the room where they put corpses with a door facing the open public

I mean, on one side.. it's not a see-through window, it's a door behind access if you nitpick with that thinking a lot of things will be very "???"

On the other side, a lot of stations already have that style of morgue, Box being one of the most iconic ones where you can access from the hallway, others share that while others use a backroom in maintenance

Finally, i believe it's intended gameplay for the aforementioned jobs and to give antags an opportunity to do things without being caught immediatly but without being necessarily "free" either, they still need to hack in, all in all just consistency pretty much!

@MarkusLarsson421
Copy link
Contributor

A surprising amount of roles has Morgue access. I recently learnt that the RD has it for whatever reason...

Copy link
Member

@spockye spockye left a comment

Choose a reason for hiding this comment

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

image

cabling errors

image

disposals error

image

light clipping into the boxes here. do try to avoid having lights on wallmounts!

image

conflict marker (chairtable)

image

double trouble

image

it floats

image

avoid stacking wallmounts

image

light + stacked mounts

image

now, whats going on here? (i wont comment on all the lights on wallmounts but. you get the gist)

image

double trouble

image

it floats

image

double trouble

image

oh me oh my

image

stacked mounts, two cameras, in walls

image

triple trouble plus double trouble
AND NO APC!!!

image

stray cabling. already a apc in here.

these issues are everywhere, though i understand why :p just thought i'd point out a couple to help out

@MarkusLarsson421
Copy link
Contributor

MarkusLarsson421 commented Jul 21, 2024

these issues are everywhere, though i understand why :p just thought i'd point out a couple to help out

image

@ClownMoff
Copy link
Contributor Author

ClownMoff commented Jul 21, 2024

these issues are everywhere, though i understand why :p just thought i'd point out a couple to help out

The issues are there because the freeze fucked everythign up, most of the stuff that is pointed out by @spockye is product of the many merge conflicts, even missplaced disposals and stuffl like that.

Also you need to fuck off and stop coming to my PRs to shit on my and what I do

@PowerfulBacon
Copy link
Member

Are you using mapmerge to merge the maps?

@ClownMoff
Copy link
Contributor Author

nO

@PowerfulBacon
Copy link
Member

You should be, otherwise you will have a terrible time with things being merged incorrectly. You can find it in the tools subfolder of the repo

Copy link
Member

@spockye spockye left a comment

Choose a reason for hiding this comment

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

image

use the new directional wallmounts!

image

image

move this light. people WILL burn their hands, using the machine and storage

image

two wallmounts stacked

image

posters should ALWAYS be +-32

image

image

apc under poster. i dont like the diskette box being on the computer. try moving the maint door one down, and adding another table or something.

image

random decal

image

image

mabye break this up with a wall? not a huge fan of a all glass wall going into maintenance.

didnt check everything. look it over one more time pretty please.

@spockye
Copy link
Member

spockye commented Jul 26, 2024

Cameras are broken all across the map, due to a faulty merge probably. please fix this.

image

image

(there are atleast thirty instances of this on the map. search by [/obj/machinery/camera/autoname]

Copy link
Member

@spockye spockye left a comment

Choose a reason for hiding this comment

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

  1. Fix the broken decalling
  2. fix the holodeck
  3. replace ALL the autoname cameras with directional
  4. fix the overlapping wallmounts
  5. fix the broken viro posters
  6. fix the broken flooring at the theatre stage
  7. fix floating light in kitchen

Look in discord for the rest of the review.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@BriggsIDP
Copy link
Contributor

Just saw a floating shutter in the bar, and a floating air alarm in botany maint

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Member

@spockye spockye left a comment

Choose a reason for hiding this comment

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

image

floating wires, bar

image

floating wire, med storage

image

broken wallmounts

image

table intercom?

image

floating air alarm

@PestoVerde322
Copy link
Contributor

immagine

This door has weird accesses

immagine

Floating firelock

Other than that all good.

Copy link
Contributor

@PestoVerde322 PestoVerde322 left a comment

Choose a reason for hiding this comment

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

Hopefully it should be all good to go, approved!

Copy link
Member

@spockye spockye left a comment

Choose a reason for hiding this comment

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

two small decal oddities. other then that, its good to go!

image
image

image

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 5, 2024
Merged via the queue into BeeStation:master with commit 036135b Sep 5, 2024
7 of 8 checks passed
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.

7 participants