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

Pizza Station is back on the menu #5887

Merged
merged 16 commits into from
Mar 17, 2024

Conversation

Nanu308
Copy link
Member

@Nanu308 Nanu308 commented Mar 6, 2024

About the pull request

Adds a Pizza Galaxy space diner to the game for the Pizza ERT. They deserve their own station as well!

The clothed tables will spawn incorrectly spritewise until Naut's PR #5838 is added to the game.

Once new cooking sprites are added I'll go back and tweak the kitchen area some more.

Explain why it's good for the game

More Soulful lore and RP spots.

Testing Photographs and Procedure

Screenshots & Videos

bilde

Changelog

🆑
mapadd: Added the Galaxy Pizza Space Diner ERT station, for all your outer expanse food needs!
maptweak: Placed APC's on ert stations and minor tweaks+fixes.
/:cl:

Pizza ERT and Fixes
Pizza Time, detailing more and slight layout changes
done, require some minor tweaks potentially.
Further Fixes & ERT homebase fixed
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Mar 6, 2024
cm13-github added a commit that referenced this pull request Mar 6, 2024
cm13-github added a commit that referenced this pull request Mar 6, 2024
cm13-github added a commit that referenced this pull request Mar 6, 2024
cm13-github added a commit that referenced this pull request Mar 6, 2024
cm13-github added a commit that referenced this pull request Mar 6, 2024
@Vicacrov
Copy link
Contributor

Vicacrov commented Mar 6, 2024

very cute station, 10/10 would visit for a pizza

Dunno if you can consider any of these issues, but here are my observations:

  1. Southwest, hangar area, double closets on one tile

image

If you open one of these closets, you cannot close it, because there is another dense structure (the second closet) on the tile.

  1. Southwest, hangar area, non-symmetrical offset

image

This briefcase overlaid with the vending machine looks weird because 1) the briefcase is a pixel narrower than the vending machine 2) if you pick up the briefcase, it leaves behind hot coffee machine with a 12px y-offset, while there is a cig vendor a bit to the right, in a similar corner, with 0px offset. It becomes non-symmetrical.

  1. Kitchen area

The red handrails are called "sandstone handrail"s, not sure if that's what you are going for.

  1. Kitchen area

image

The empty jar object is a nightmare to click on (the transparent pixels are non-clickable), it is pretty much impossible to pick it up unless you right-click it. You might want to replace it with a beaker that can be actually used.

  1. East of kitchen area

image

This cig vendor, exclusively among the other vending machines, has a 3px y-offset. 😢

  1. Kitchen and cleaning

image

This fire safety closet has an x-offset, even though it is a singular closet. It would look much better (and consistent) without the offset.

  1. STAFF ONLY bolted airlock

image

I do not see the point of this airlock being bolted (red) when none of the other airlocks (blue) have an ID access. Maybe give them a civilian logistics (ACCESS_CIVILIAN_LOGISTICS) access?

Bonus funny:

If you middle-click the handrails because you are an idiot like me who cannot aim at the boxes properly, you vault over the table and the handrail in a split second.

intended handrails mechanics
dreamseeker_ME5BWcfAbZ.mp4

cm13-github added a commit that referenced this pull request Mar 6, 2024
@Drulikar
Copy link
Contributor

Drulikar commented Mar 6, 2024

CI requires fixes from #5891

cm13-github added a commit that referenced this pull request Mar 6, 2024
Pizza time Fixes Vica
@Nanu308
Copy link
Member Author

Nanu308 commented Mar 7, 2024

very cute station, 10/10 would visit for a pizza

fixed le contrib review

@Vicacrov
Copy link
Contributor

Vicacrov commented Mar 7, 2024

fixed le contrib review

Looks good!! It'd be probably better to make a new subtype of the sandstone railing though, rename it to "red railing", and map that in, instead of renaming every single instance on the map. It makes it more reusable (admins can spawn it in during the game), plus I think we prefer things to have its own subtype as opposed to having it varedited on the map (except for pixel-shifts).

This might be an old design rule I remember, though, because I cannot find it in the contributor guidelines. :waaa:

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Layering for some of the handrails is incorrect. Also the barriers between the dock and the station probably should be named something else at least.

image

@Drulikar Drulikar marked this pull request as draft March 8, 2024 19:34
cm13-github added a commit that referenced this pull request Mar 8, 2024
@Staykeu Staykeu mentioned this pull request Mar 9, 2024
3 tasks
@Nanu308
Copy link
Member Author

Nanu308 commented Mar 9, 2024

Layering for some of the handrails is incorrect. Also the barriers between the dock and the station probably should be named something else at least.

image

layers should be fixed, also named docking umbilical correctly

@Nanu308 Nanu308 marked this pull request as ready for review March 9, 2024 09:23
cm13-github added a commit that referenced this pull request Mar 9, 2024
cm13-github added a commit that referenced this pull request Mar 9, 2024
cm13-github added a commit that referenced this pull request Mar 10, 2024
cm13-github added a commit that referenced this pull request Mar 11, 2024
@Drulikar Drulikar marked this pull request as draft March 11, 2024 20:22
@ATP2333REAL ATP2333REAL mentioned this pull request Mar 11, 2024
3 tasks
cm13-github added a commit that referenced this pull request Mar 12, 2024
cm13-github added a commit that referenced this pull request Mar 13, 2024
cm13-github added a commit that referenced this pull request Mar 13, 2024
@Lagomorphica Lagomorphica mentioned this pull request Mar 13, 2024
3 tasks
@Nanu308 Nanu308 marked this pull request as ready for review March 13, 2024 15:22
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Everything else looks fine.

Minor: Layering of cig machine and stack of chairs could be elevated some so the handrails north of them aren't above them:
image


cm13-github added a commit that referenced this pull request Mar 14, 2024
@Nanu308 Nanu308 marked this pull request as draft March 14, 2024 20:23
@Nanu308 Nanu308 marked this pull request as ready for review March 15, 2024 22:40
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Mentioned on discord, but just putting it here too:

Much like the cig machine, the play has the same issue, so you should make it the same layer as the player so their layering depends on whether they are south or north of the barricade. The + 0.01 is because it tweaks the layer slightly depending on facing, so the adjustment makes it the same. It also appears that this makes the var edits for the other barricades unnecessary.

So in summary:

  • Use layer = MOB_LAYER + 0.01 under /obj/structure/barricade/handrail/pizza in code
  • Remove all usage of map var edited handrail overrides (should be just one prefab kind)

Further Fixes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

The var edited barricades still aren't perfect; but its good enough.

@Drulikar Drulikar added this pull request to the merge queue Mar 17, 2024
@Drulikar Drulikar added the Mapping Approved adds 500 new dict keys label Mar 17, 2024
Merged via the queue into cmss13-devs:master with commit 8e63a25 Mar 17, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants