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

Corporate Security aesthetic update #6441

Merged
merged 10 commits into from Dec 18, 2014
Merged

Corporate Security aesthetic update #6441

merged 10 commits into from Dec 18, 2014

Conversation

ghost
Copy link

@ghost ghost commented Dec 17, 2014

Fixes #6439 #6438 #6431 and all other outstanding bugs with the previously merged PR from steelpoint

This PR isn't meant to primarily fix these metric fuckshit of bugs, but I am saying that it does fix them in any case

  • Replaces default uniforms with more corporate uniforms
  • Replaces armor with thinner, more form-fitting body armor
  • Replaces warden jacket with navy blue warden's jacket
  • Replaces warden drill hat with a navy beret for the warden
  • Roundstart HoS will now use trenchcoat and beret instead of cap and greatcoat, though they are still in his locker
  • Nerfed the helmet-tier armoring on the security berets
  • Moved helmets to the armory
  • Moved gas masks from sec officer lockers to warden's office
  • Added a few extra bulletproof vests to the armory
  • Updated security belt sprite to mesh better with the new armor
  • Security officers now spawn with bowmans for flashbang protection

Main / Alternate
Officer
mainrend altsec

Warden
rndwrd finward

HoS
hosrnd hosalt

Based loosely :^) on the sarif guards from the deus ex reboot

Sprite credit to anonymous guy on singulo.

Poll is awaiting approval on the feedback forum but it has been created.

@Thunder12345
Copy link
Contributor

Dammit Paprika, I'm already fixing those bugs separately from adding new stuff.

@ghost
Copy link
Author

ghost commented Dec 17, 2014

Read the PR.

@Steelpoint
Copy link
Contributor

Have you made a thread or asked the community on what their thoughts are?

@ghost ghost changed the title corporate security initial commit Corporate Security overhaul Dec 17, 2014
@ghost
Copy link
Author

ghost commented Dec 17, 2014

Read

The

PR

@Steelpoint
Copy link
Contributor

Which poll, link it in the OP.

@ghost
Copy link
Author

ghost commented Dec 17, 2014

Read it again

@Steelpoint
Copy link
Contributor

The only poll on the feedback forum is the one I made.

@Jalleo
Copy link
Contributor

Jalleo commented Dec 17, 2014

Its awaiting approval since all of paps messages on feedback require that

@Giacom
Copy link
Contributor

Giacom commented Dec 17, 2014

Your use of the word overhaul doesn't cover fixing bugs, just changing a lot of the code to have a new system in place.

@ghost
Copy link
Author

ghost commented Dec 17, 2014

Like I said if you bothered to read: My PR just HAPPENS to fix these bugs, if it gets merged before specific bug fix PRs are merged. I changed armor around and stuff and cleared up pre existing bugs with stuff.

@RemieRichards
Copy link
Contributor

I think gia's comment is more on the misuse of the word overhaul. Revision would probably be a better term.

@ghost ghost changed the title Corporate Security overhaul Corporate Security aesthetic update Dec 17, 2014
@Dorsisdwarf
Copy link
Contributor

This actually makes security look more menacing, but in an a more subtle way than LOOK IM A FACELESS NAZI MONSTER.

Not sure if I like it especially, but it's interesting for sure.
Plus, greyshirts now refers to security, which is EXCELLENT

@ChangelingRain
Copy link
Contributor

I'd tell you to stop but it wouldn't do anything.
I do like these sprites, though, they're pretty cool.

@pudl
Copy link

pudl commented Dec 17, 2014

they're fine, i support it/please revert berets/also please remove the golden gubbins on the hos' trenchcoat

@ghost
Copy link
Author

ghost commented Dec 17, 2014

  • Added red sleeves for officers to better distinguish them
  • Modified armor to be in line with the current kevlar vest aesthetic

@pudl
Copy link

pudl commented Dec 17, 2014

update op?

@Steelpoint
Copy link
Contributor

As I said on the IRC, I like these changes barring the Warden.

(The red sleeved change that is)

@pudl
Copy link

pudl commented Dec 17, 2014

warden is and always will be the fashionista

@pudl
Copy link

pudl commented Dec 17, 2014

hg merge it before steelpoint makes another pr

@Steelpoint
Copy link
Contributor

As I said.

👍

@Steelpoint
Copy link
Contributor

However, nerfing the beret to a low armour rating means officers will just get the helmets out, negating the reason to wear the berets

@pudl
Copy link

pudl commented Dec 17, 2014

i only wear my helmet in case of emergency, and i know a few others like that (owegno?)

@ghost
Copy link
Author

ghost commented Dec 17, 2014

OP will remain oudated likely until this is merged because it's a pain in the butt to play dress up in DM for these pseudo screenshots

But basically all I did was trim down the collar on the current kevlar armor, and blend the sleeves of the dress shirt into a red color so that security is more immediately identifiable

Thanks to MrPerson for suggesting it. I can't believe I didn't think of it sooner

fina

Edit: Before this is merged, I'm going to make the sleeves match the red of the beret a bit closer

@ghost
Copy link
Author

ghost commented Dec 17, 2014

ss 2014-12-17 at 11 51 44

Darkened the sleeves a bit to go better with the beret.

@Steelpoint
Copy link
Contributor

The poll is still around 50/50 either way.

I disagree with the changes you've been suddenly making because your moving away from a compromise, of which is meant to be something that both proponents can at least agree to, and back into something you want over me.

@ghost
Copy link
Author

ghost commented Dec 18, 2014

No, people in this PR have expressed they want the grey sleeves instead, so I'm moving towards what the majority of people want, not just you. That's only fair considering your previous PR where you kicked all the work I had done to the curb because of a poll and made no attempt to compromise.

@Steelpoint
Copy link
Contributor

I'll leave my comments here for the moment.

All I'll say is that this PR is turning security's primary colour from red to grey. Sec ain't grey.

@ghost
Copy link
Author

ghost commented Dec 18, 2014

I'll go back to red sleeves if people agree that they looked better than the current grey + badges thing. I just wanted to offer an alternative as people preferred grey sleeves.

@Razharas
Copy link
Contributor

Sec is now grey?
What?
Did @Cheridan The Overlord Of The Sprites agreed to that?

@ghost
Copy link
Author

ghost commented Dec 18, 2014

Up to you guys. People expressed they wanted grey sleeves, so I made them grey again. This is a really easy edit to make, people obviously want these sprites so decide between red and grey sleeves for the dress shirt
Okay?

Edit: let me make some clearer screenshots

@Razharas
Copy link
Contributor

Current sleevs looke like husk overlay with this burnt grey and deep bloody red

@ghost
Copy link
Author

ghost commented Dec 18, 2014

grey red

Decide pls I really don't care anymore which one we use

@Steelpoint
Copy link
Contributor

You need to have the armour on to finish the look. Officers will be wearing the armour 95% of the time.

Also why does the sleeve fade to white when connecting to the grey?

E: Also keep the ausops armour but without the neckline

@ghost
Copy link
Author

ghost commented Dec 18, 2014

It looks better than straight red to grey, tbh, the janitor jumpsuit does this too, but I can make it straight red to grey if people prefer that, see below

nofade

@Steelpoint
Copy link
Contributor

It just looks a bit too white when converting, but show us it when wearing armour for the best comparison, I would not mind the changeover if its mostly underneath the armour.

@ghost
Copy link
Author

ghost commented Dec 18, 2014

armor armor2

Here's red sleeves / grey sleeves with armor vests on

Also for some reason the jumpsuit went on top of the jackboots in the grey sleeved pic

@ghost
Copy link
Author

ghost commented Dec 18, 2014

I'm gonna leave this be for a day and allow people to comment while I work on the poll as well I don't know why it hasn't been approved yet, blame MSO I guess

Current topic: Red sleeves or grey sleeves + badges

It's a rather simple adjustment to make since it's really only on the officer's suit anyway so fire away

@Atskadan
Copy link
Contributor

i like grey better because if you cant recognize a security officer (aka the only people wearing armor, helmets, jackboots, and red sunglasses on the station) youre blind and should probably not be using a computer because you might accidentally break it

@Steelpoint
Copy link
Contributor

But as I said, those sprites make security predominantly grey and not red. People expect security to be red.

Lets see what the forums come up with though.

@ghost
Copy link
Author

ghost commented Dec 18, 2014

People only expect security to be red because security is red right now

Just like people used to expect armor to be grey and now it's black, all of this shit will change with time, so that as an argument is really not an issue

@Steelpoint
Copy link
Contributor

Ultimately it boils down to people's opinion of how the sprites for both sides work, and the fact of the matter is both sides are right in their opinions.

It just depends on which side has more support.

@ghost
Copy link
Author

ghost commented Dec 18, 2014

Added old warden's jacket to the back of his locker instead of a plain armor vest so he may wear the red trenchcoat if he desires instead of the navy police coat

@ghost
Copy link
Author

ghost commented Dec 18, 2014

After some discussion i think we've settled on red sleeves as a permanent solution for officers. I removed the 'gradient' fade into the grey part that was kind of noticible when wearing armor.

Review pls.

@Steelpoint
Copy link
Contributor

I can live with the Warden's getup.

I approve, besides if that idea we have cooked up in IRC pans out then everyone will be happy forever!

@ghost
Copy link
Author

ghost commented Dec 18, 2014

ok someone merge this now

@Cheridan
Copy link
Contributor

Waiving the 24h period on this in the interest of world peace and harmony

Cheridan added a commit that referenced this pull request Dec 18, 2014
Corporate Security aesthetic update
@Cheridan Cheridan merged commit 566066a into tgstation:master Dec 18, 2014
@ghost ghost deleted the corpsecthecorpening branch January 16, 2015 00:36
optimumtact pushed a commit that referenced this pull request Jan 29, 2022
…stituents #6441

About The Pull Request

Same vein (although a lot larger than) #64118

On the tin. This moves them into their own folders and the paths were updated in the code.
Why It's Good For The Game

It's not exactly good visuals for stuff that can be placed elsewhere to just be sitting in the root. Organization is nice.
Changelog

cl
fix: For those of you into code, some stuff with the icon pathing has been shuffled around so it's no longer in the roots of the icon/ folder. If you aren't into code, that's fine too.
/cl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Security job preview is broken