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

CL Containment Chamber De-Metagamifyer #7427

Merged
merged 8 commits into from
Nov 5, 2024

Conversation

thevandie
Copy link
Contributor

@thevandie thevandie commented Oct 29, 2024

About the pull request

This PR makes it so that MPs will no longer have any justification to metagame the corporate liaison's containment cell without it being EXTREMELY obvious.
The containment cell's divider now just looks like an ordinary wall, and it has a custom opening and closing sprite for that purpose.

The button for the containment cell has also been moved to the back office, as has the control panel to access it. The button has been replaced with a button for the back office shutters, and the console has been replaced with a TV (a thing liaisons have wanted stock standard in their office ever since Combat Correspondent was added).

This PR also changes some minor stuff around the CL's office to make it cleaner, and adds a WY-MRE to the cabinet, as the office had no food in it for some reason (which has caused a few new liaisons to eat the monkey cubes, thinking they were food cubes).

Finally, I also changed the containment cell's area name to "Storage Room" so if an MP is snooping around the liquor cabinet, they don't see "Containment Cell APC."

The PR contains mapping changes, of course. I know Alaymer Mapping changes are supposed to be frozen, but I asked Nanu and he specifically said something like this would be minor enough (and useful enough) to be acceptable.
I tested all the changes and used mapmerge.
This PR also includes sprite additions. They shouldn't conflict with blundir's sprite freeze, as i asked him and he said the file i modified wasn't included in the pr. He can weigh in personally to confirm that.

Explain why it's good for the game

MPs metagaming the existence of the containment cell is extremely annoying, and no one likes it. Making it much harder for them to just say "CL open the containment cell" or "HMM, what does this button labelled CONTAINMENT SHUTTERS on your desk DO???" is a good change.

Also the CL not having any food in his office is a tad weird, I feel like some donks in the back makes sense
same with the TV, every CL player has wanted a TV in their office roundstart since CC was added

Testing Photographs and Procedure

Screenshots & Videos

image

this video doesn't properly show the desk configuration, but it shows the animation quite well. (it was an old video)

xUVoud3.mp4

image

image

Changelog

🆑
imageadd: added a new sprite for the liaison's wall divider behind his desk
mapadd: added a WY mre to the liaison's liquor cabinet (cardboard box full of donk pockets)
mapadd: added a tv to the liaison's desk, in place of the containment cell console
mapadd: added a new button to the liaison's desk to replace the wall divider button. it controls the back office shutters
maptweak: moved the liaison's shutters button and console to the back office
maptweak: moved some stuff around in the liquor cabinet to accommodate the MRE being placed into it
maptweak: moved some stuff around on the liaison's desk to make it look cleaner
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? labels Oct 29, 2024
@thevandie
Copy link
Contributor Author

Ill figure out why it's failing tests tomorrow, it worked just fine on local so... we'll have to see

@BeagleGaming1
Copy link
Contributor

Ill figure out why it's failing tests tomorrow, it worked just fine on local so... we'll have to see

image
When updating it, you removed the quotes around RoomDivider

@thevandie
Copy link
Contributor Author

thevandie commented Oct 29, 2024

When updating it, you removed the quotes around RoomDivider

ah, that'd be it

@thevandie
Copy link
Contributor Author

WE ARE CLEAR FOR TAKEOFF!

@thevandie
Copy link
Contributor Author

thevandie commented Oct 31, 2024

It doesn't conflict with the psych ward
Ill run it on local but we appear to be in business

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.

mapping lgtm

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

@harryob harryob left a comment

Choose a reason for hiding this comment

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

code

@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Nov 4, 2024
@Drulikar Drulikar added this pull request to the merge queue Nov 5, 2024
Merged via the queue into cmss13-devs:master with commit 5b4bfd6 Nov 5, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 5, 2024
@thevandie
Copy link
Contributor Author

Yippee!

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? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants