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

[MIRROR] Resprites SpacePol Uniforms (And accessories) #1208

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25703
Original PR: tgstation/tgstation#80317

About The Pull Request

Hello ancient sprite how u doin today :)
image

One de-souling later: Long Scream - Sound Effect - Youtube
image


Full and in-depth Changelist since there's a bit of random semi-related digging:

  • Removes redundant /datum/armor/warden_red and strip_delay from /obj/item/clothing/head/hats/warden/red - the armor values were the exact same as those of /datum/armor/hats_warden, which it'd inherit anyways alongside the strip_delay
  • Removes a comment I left forever ago when I re-did Trek uniforms. I never actually pushed the commit referenced by the comment. It's just been sitting there, lying to anybody who read it. I know this is 100% unrelated to the PR but it was a comment I left that's a lie. I don't mean to lie D:
  • Gives the Mafia Warden outfit the red hat, to match the red jacket it wears
  • Adds an extra pixel to the spacepol mask so it actually covers the nose on the side-state
  • Resprites spacepol uniform
  • Removes entirely unused police uniform obj icon_state
  • Recolors policehelm hat to match the new palette
  • Tweaks and Recolors warden_alt suit to match the new palette and have more consistent shading with the other warden jacket

Why It's Good For The Game

WOOP WOOP ITS DA SOUNDA DA POLICE (Screenshot is slightly outdated, missing the new buttons, but it's still mostly accurate)
image
image

And since the Warden reuses that hat, his jacket's been tweaked to match it's tweaks. Along with shading adjustments to have less 'banding' as somebody on discord put it (idk spriting terms I assume that I fixed it)
image

Changelog

🆑 OrionTheFox
image: the SpacePol bounty hunters have finally had a new run of Uniforms made, bringing them back to the forefront of enforcement fashion! Wardens will find their Police Jackets/Hats have been updated match SpacePol's new look as well.
fix: fixed the Mafia Warden having a hat that didn't match his jacket, and fixed SpacePol masks not covering the nose
/:cl:

…#25703)

* Resprites SpacePol Uniforms (And accessories) (#80317)

* Resprites SpacePol Uniforms (And accessories)

* Digi refit by Orion

---------

Co-authored-by: OrionTheFox <[email protected]>
Co-authored-by: Giz <[email protected]>
@ReezeBL ReezeBL merged commit acea6e3 into master Dec 20, 2023
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25703 branch December 20, 2023 06:47
AnywayFarus added a commit that referenced this pull request Dec 20, 2023
Iajret pushed a commit that referenced this pull request Feb 29, 2024
* Fixes bows not loosening their strings once fired (#81724)

## About The Pull Request
So, there's this one place that could have just called `clear_chambered`
because it does the exact same operations, but didn't.

Here's `gun/ballistic/proc/clear_chambered()`:

https://github.com/tgstation/tgstation/blob/ce04e2b7ee279e025bd53e87296e7dfd70b9474a/code/modules/projectiles/guns/ballistic.dm#L285-L288

and here's `gun/ballistic/bow/clear_chambered()`, which is responsible
for setting `drawn` to false:

https://github.com/tgstation/tgstation/blob/ce04e2b7ee279e025bd53e87296e7dfd70b9474a/code/modules/projectiles/guns/ballistic/bows/_bow.dm#L52-L54

You can connect the dots.

* Fixes bows not loosening their strings once fired

---------

Co-authored-by: Ghom <[email protected]>
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.

3 participants