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

Service gets their own security guard #8286

Merged
merged 8 commits into from Apr 28, 2020

Conversation

smorgli
Copy link
Contributor

@smorgli smorgli commented Apr 26, 2020

Intent of your Pull Request

Hydroponics guard armbands exist but nobody ever uses them, in my thought process i just decided to make an entire expansion to the security department, the service guard!

They get their own pretty armband, a headset with a service key, all service access on their card (excluding crematorium), and probably the biggest change, the service security post.

dreamseeker_3PvnVgViMA

I just expanded the service lathe room north a bit and put the security post in it, library is now 3 tiles smaller as a result. You may be wondering where did the lathe go? How will i print my floor buffer upgrade as a janitor? Here it is:

dreamseeker_9WlCne71XU

Every one of the service jobs can access this room so it being in maint is not that much of a problem, some other maps do it anyway, eg. Metastation. The only real drawback to this is that hydroponics loses some of their territory and one drying rack but they only ever need one anyway.

Is this a good idea? This seems like a good idea.

Changelog

🆑
rscadd: adds service department guard
tweak: service lathe moved to maint
imageadd: service sec band
/:cl:

@smorgli smorgli requested a review from Ktlwjec1 as a code owner April 26, 2020 22:54
@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Icon Change Mapping Will result in a change to a map. Tweak This PR contains changes to the game. labels Apr 26, 2020
@grimm-hollowknight
Copy link
Contributor

its back in maint pog

@Jumps0
Copy link
Contributor

Jumps0 commented Apr 26, 2020

maint wall door pog

@github-actions github-actions bot added the Sprites This PR has spriting changes label Apr 26, 2020
@Partheo
Copy link
Contributor

Partheo commented Apr 26, 2020

I feel like it doesn't make thematic sense that service would have a security guard, since it's not a limited access department. I do like how the sec office looks though.

Copy link
Contributor

@grimm-hollowknight grimm-hollowknight left a comment

Choose a reason for hiding this comment

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

You've made the band have a sprite for 8 directions which is un-needed.

If you click the button circled in red it'll make the sprite be 1 direction and fix it.

image

EDIT
The mob sprite is also inconsistent with the rest of the bands that are actually used in-game, the hydroband is a different shape and position for whatever reason.

see:
image
image

I've already made the edit to make it consistent for you but I can't upload it here so I'll ping you on the discord

@smorgli
Copy link
Contributor Author

smorgli commented Apr 26, 2020

This was my first time ever spriting anything, its fixed now.

@Readystorm546
Copy link
Contributor

Is this gonna conflict with #8279

@smorgli
Copy link
Contributor Author

smorgli commented Apr 27, 2020

Is this gonna conflict with #8279

literally why, its in different parts of the station

@MegaEmpirical
Copy link

Are those grilles shocked?

@smorgli
Copy link
Contributor Author

smorgli commented Apr 27, 2020

Are those grilles shocked?

They are not shocked just like every other department sec checkpoint

@MegaEmpirical
Copy link

Missed opportunity!

@Hopekz
Copy link
Contributor

Hopekz commented Apr 27, 2020

Missed opportunity!

I think consistency is more important

@smorgli
Copy link
Contributor Author

smorgli commented Apr 27, 2020

Missed opportunity!

I think consistency is more important

I could change all of them to be shocked but, why? That level of security is not really required for these since anyone can just welder the walls down anyway. Also changing them all would be out of scope of this PR.

@Hopekz
Copy link
Contributor

Hopekz commented Apr 27, 2020

Missed opportunity!

I think consistency is more important

I could change all of them to be shocked but, why? That level of security is not really required for these since anyone can just welder the walls down anyway. Also changing them all would be out of scope of this PR.

What I meant is:
Consistency is important as in do not change it to shocked

That type of PR would have to be atomized as it is a balance PR

@smorgli
Copy link
Contributor Author

smorgli commented Apr 27, 2020

Missed opportunity!

I think consistency is more important

I could change all of them to be shocked but, why? That level of security is not really required for these since anyone can just welder the walls down anyway. Also changing them all would be out of scope of this PR.

What I meant is:
Consistency is important as in do not change it to shocked

That type of PR would have to be atomized as it is a balance PR

yeah sorry, i quoted one comment too many, wanted to respond to MegaEmpirical

@MegaEmpirical
Copy link

Hmmm, you make a point security should always been surrounded by r walls.

@smorgli
Copy link
Contributor Author

smorgli commented Apr 27, 2020

Hmmm, you make a point security should always been surrounded by r walls.

What I mean is that these security checkpoints should not be surrounded with rwalls or electrified grilles since its not the actual brig, just checkpoints

code/_globalvars/lists/flavor_misc.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/accessories.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Ktlwjec1 Ktlwjec1 left a comment

Choose a reason for hiding this comment

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

Map changes -

  • camera name needs changing from "Security Post - Medbay"
  • move the lightswitch next to the airlock (where the air alarm is currently)
  • one of the tables is 3 tables on the same tile
  • Move the airlock and windows, cables + pipes need to be moved to go through the new airlock.

Example of the windows + airlock (before and after). Also play around a bit with the layout, below is an example of how to make it seem less cramped (by putting tables together).
image

@smorgli
Copy link
Contributor Author

smorgli commented Apr 28, 2020

Man, I did a really sloppy job with this one, I went for your changes since they look way better, this is the end result:
vivaldi_wGhSAY9wwX

@smorgli smorgli requested a review from Ktlwjec1 April 28, 2020 11:26
Copy link
Contributor

@Ktlwjec1 Ktlwjec1 left a comment

Choose a reason for hiding this comment

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

Map is fine. Get other maints/hc to merge this since it's not a full mapping pr.

@deathslayer2481
Copy link

Unga me make tesla tomato as botany sec guard and unga squash on people like tazer

@alexkar598 alexkar598 merged commit 4b72bb2 into yogstation13:master Apr 28, 2020
@smorgli smorgli deleted the servicesec branch June 14, 2020 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes Tweak This PR contains changes to the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet