Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds digitigrade jumpsuit alts using ThatGuyPhil's icons #11744

Merged
JamieD1 merged 2 commits into from
Jul 18, 2021
Merged

Adds digitigrade jumpsuit alts using ThatGuyPhil's icons #11744

JamieD1 merged 2 commits into from
Jul 18, 2021

Conversation

@nmajask
Copy link
Contributor

@nmajask nmajask commented Jul 10, 2021 •
edited
Loading

Github documenting your Pull Request

While looking through some of the old PR's, I stumbled into "uniform sprites for digitigrade lizardpeople #10931" by ThatGuyPhil. So I readded it and made it kinda work.

I have updated and added a few new icons that weren't in the original PR, but there are still many uniforms that need digi alts (Any that are in yogstation/icons/mob/ have not been touched). I will try to continue adding/updating important ones and will add any given to me of they work. The code is not very good, but it does function.

Due to the scope of this PR, I have done very limited testing and there are likely many issues that I have not found.

Here is an example of it working (It was taken before I fixed some stuff):
digicap

Here are some newer image:
digiminer

digisec

I have done some more testing and have tried some things that I thought would break the code. Luckily I found much fewer errors than I thought I would, for example I thought wearing a hardsuit or wearing a uniform casually would cause major issue but they didn't. The current list of issues I have found are:

  • Suits still don't have digi icons or implementation, so hardsuits or any other suit that covers the wearers legs will squish them into normal legs
  • Some icons have icons that look weird when wearing footwraps (medical jumpsuit is a good example
  • In order to allow a uniform to use digi sprites, you need to redefine 2-3 vars

Jobs That Still Need Digi Uniform Sprites:

  • Maybe Psych

Job Uniforms That Have Bad or No Implementation of Digi Sprites:

  • Artist (not working)
  • Mining Medic (bad sprites)

Wiki Documentation

As far as I am aware, this shouldn't require changing anything in the wiki, but I could be wrong.

Changelog

🆑
imageadd: Readded icons from ThatGuyPhil's "uniform sprites for digitigrade lizardpeople" #11017 and added/updated some
experimental: Added support for digitigrade uniforms
/:cl:

@nmajask
Changes a lot of stuff for digi uniforms
f2eac89 
Did A LOT of things
- Support for digi versions of alt uniforms
- Readded and tweaked icons by ThatGuyPhil in "uniform sprites for digitigrade lizardpeople yogstation13#10931"
- Added support for all the base file clothings
- Probably some other stuff but my brain is a fine paste right now
@nmajask nmajask requested a review from a team as a code owner July 10, 2021 07:03
@Yogbot-13 Yogbot-13 added the Sprites This PR has spriting changes label Jul 10, 2021
@nmajask
Added more support
3b66b17 
Added more icons for various jobs:
- Artist (not working)
- Tourist
- Clerk
- Sig Tech
- Mining Medic (not very good)
@nmajask nmajask changed the title Reverts "Revert "uniform sprites for digitigrade lizardpeople" #11017" and adds functionality Adds digitigrade jumpsuit alts using ThatGuyPhil's icons Jul 12, 2021
@nmajask nmajask mentioned this pull request Jul 15, 2021
Merged
7 tasks
nmajask added a commit to nmajask/Yogstation-But-Worse that referenced this pull request Jul 16, 2021
@nmajask
Many requested changes
73aa83f 
- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in yogstation13#11744
@nmajask
Copy link
Contributor Author

nmajask commented Jul 17, 2021

I think I finally figured out what the issue with the issue is with the footwraps, it appears that their icons are a bit too small and don't fully cover digi feet and, by extension, the jumpsuit.

@nmajask
Copy link
Contributor Author

nmajask commented Jul 17, 2021

Wait, why does my almost exclusively art PR not require a review from the art director?

@JamieD1 JamieD1 merged commit 3d7382a into yogstation13:master Jul 18, 2021
Yogbot-13 added a commit that referenced this pull request Jul 18, 2021
@Yogbot-13
Automatic changelog generation #11744 [ci skip]
adac77b
@nmajask
Copy link
Contributor Author

nmajask commented Jul 18, 2021

Oh, I was still working on stuff for this and waiting for Grimm's feedback

nmajask added a commit to nmajask/Yogstation-But-Worse that referenced this pull request Jul 19, 2021
@nmajask
Another bunch of changes
308897c 
- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for yogstation13#11744 now that its merged
- Fixed a merge conflict
@nmajask nmajask mentioned this pull request Jul 24, 2021
Merged
JamieD1 pushed a commit that referenced this pull request Aug 1, 2021
@nmajask
Fixes "Adds digitigrade jumpsuit alts using ThatGuyPhil's icons #11744"…
88e968c 
… (#11884)

* Fixes some stuff

- Removed digiversion and digiadjusted vars from _under.dm and any file they appear in as they are redundant
- Added support to medsci, engi, security, and artist jumpsuits for digialts which I had finished but forgot to put into the PR... oops
- Added digialts for wardens jacket and explorer's suit
- Changed the footwrap icon so it fits digi feet. Only temperary until someone makes a resprite
- Cleaned up some of my previous PRs

* Removes the footwrap changes

- Removes the footwrap as Footwrap re-sprite #11885 by
cuackles has way better sprites than mine and to prevent a merge conflict with it. If that PR doesn't get merged, ill re-add the changes.

* Fixes chaplains jumpsuit

- Fixes chaplain's jumpsuit so it doesn't use the placeholder
adamsong added a commit that referenced this pull request Aug 25, 2021
@nmajask @JamieD1 @adamsong
Adds Brig Physicians (#11776)
a75671b 
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Adds brig physicians

Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.

* Fixed some stuff

- Fixed some stuff I forget to change on some maps
- Added new landmark icons

* Removed Brig Physician's ability to be an antag

Removed Brig Physician's ability to be antag and gave them a mindshield

* Many requested changes

- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744

* Another bunch of changes

- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict

* Might fix one of the merge conflicts

ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun

* Should finally bring this back to a functional state

Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff

* Thought I fixed this

- Fixes the Brig Physician's skill capes using the wrong job

* Should fix wejengin2's issues with the maps

Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary

* Should fix Kilo

I redid all of the changes to Kilo

* Fixes an issue with the upstream merge

- For some reason the syndie icon change didnt save, so I fixed it
- Updated the digialt stuff

* Fixes the zombie hud sprite

- Re-added the zombie hud icon by Cauckles

* Adds some of adamsong's requested changes

* Other part of adamsong's request

Makes it so the brig physician only reports to the CMO

* This seems important

Updates the dme

* Messes with access

Made a bunch of changes, most of which were requested by adamsogm
- Removed brig phys access from the warden
-Added brig phys access to CMO and HoS
- Moved brig phys access from sec to medical
- Fixed the max skill cape

* Revert "Removed Brig Physician's ability to be an antag"

This reverts commit 53cc9cb.

* Adds first-aid kits to sec offices

* Reworks the eclipse infirmary

* Adds alternate job names

Adds alternate job names, just needs to be uncommented to work (I think)

* Removed changes to warden.dm

aaaaaaaah

* fixes some stuff with test merges

fixes some stuff with test merges I think

* Fixes more test merge conflicts

Fixes more test merge conflicts i think

* Fixes my Geneva Convention violation

Great, now my art is so bad it made me a war criminal

* Revert "Merge branch 'master' of git://github.com/yogstation13/Yogstation into brigphys"

This reverts commit 2bde593, reversing
changes made to f7178ff.

* Revert "fixes some stuff with test merges"

This reverts commit 565fb9c.

* Revert "Revert "Merge branch 'master' of git://github.com/yogstation13/Yogstation into brigphys""

This reverts commit 8fcb7e0.

* should fix some stuff with job alt titles

should fix some stuff with job alt titles

* Should fix this mess

Im so good at coding

* Fixes more things

- Fixed Brig Physician incorrectly be labeled as sec in many parts of the code
- Fixed mining medic's cap being invisable
- May have fixed the alternate job titles (I forgot to uncomment it)

* Plasmameme outfit

Adds plasmameme outfit

* Rearranges some stuff in the box infirmary

* Revert "Revert "Removed Brig Physician's ability to be an antag""

This reverts commit 3643959.

* Fixes meta

* Fix merge error

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
JamieD1 pushed a commit that referenced this pull request Feb 2, 2022
@nmajask
Renames Yogstation to YogsBox (#12959)
5c91612 
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Adds brig physicians

Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.

* Fixed some stuff

- Fixed some stuff I forget to change on some maps
- Added new landmark icons

* Removed Brig Physician's ability to be an antag

Removed Brig Physician's ability to be antag and gave them a mindshield

* Many requested changes

- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744

* Another bunch of changes

- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict

* Might fix one of the merge conflicts

ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun

* Should finally bring this back to a functional state

Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff

* Thought I fixed this

- Fixes the Brig Physician's skill capes using the wrong job

* Should fix wejengin2's issues with the maps

Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary

* Renames yogstation

Renames yogstation to yogsbox, this time with less merge conflicts and unintended changes.

* Revert "Merge branch 'yogstation13-master' into rename-box2"

This reverts commit 8023f3b, reversing
changes made to 0ea447c.

* aaa

aaa

* Revert "aaa"

This reverts commit d9843df.

* does this work?

aaa

* this might be important

Reverts the removal of box
JamieD1 added a commit that referenced this pull request Jun 11, 2022
@nmajask @Anvilman6
@SomeguyManperson @Skrem7 @JamieD1
Bones, Bows, and Bamboo - Ports "Tribal crafting expansion", "Adds ba…
8d52357 
…mboo walls, stools, benches, recolours and resprites existing bamboo items" and other assorted Bee PRs [IDB IGNORE] (#13634)

* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Adds brig physicians

Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.

* Fixed some stuff

- Fixed some stuff I forget to change on some maps
- Added new landmark icons

* Removed Brig Physician's ability to be an antag

Removed Brig Physician's ability to be antag and gave them a mindshield

* Many requested changes

- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744

* Another bunch of changes

- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict

* Might fix one of the merge conflicts

ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun

* Should finally bring this back to a functional state

Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff

* Thought I fixed this

- Fixes the Brig Physician's skill capes using the wrong job

* Should fix wejengin2's issues with the maps

Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary

* Bows, bamboo, and bones

Ports the stuff

* Before i get yelled at

* ack

* Some sprites I forgot to save

* Syndicate bow

* Map changes

* Other bee ports

This might be a bit too much to add

* Fixes invisible bows in Fastdmm2 and a build error

* oops

* Some tweeks/fixes

* More stuff

Added more footwraps, ported tribal skirts, and fixed hardlight bows

* merg

* oops

* aaa

* Gramger

Thanks Anvilman

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Revert "Merge branch 'yogstation13-master' into tribal-crafting-port"

This reverts commit b0396f5, reversing
changes made to 3085d93.

* Revert "Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port"

This reverts commit 3296724, reversing
changes made to b0396f5.

* Fix

* More fix

* removes some stuff

for now

* fixed dart guns

* Embed stuff

pain

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* ADMIN LOG: A

* fixes

* pain

* less debug

* Readd the changes

* balance

* hardlight bow stuff

* bamboo

* starting recipes and stuff

* More clothes

Ports some stuff

* Adds the clothing to the map

* balance

* Slug fix

* MELEE!

* Crossbows

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Hardlight bow arrow embedding

* Ashwalker nest tweaks

* Balance

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Bow fixes and minor balance changes

* Im dum

* fix

* Update code/modules/projectiles/boxes_magazines/_box_magazine.dm

* reorganized crafting menu

aaaaaa

* huh

* fex

* removed broken code

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@JamieD1 JamieD1 JamieD1 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Sprites This PR has spriting changes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@nmajask @JamieD1 @Yogbot-13