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

[TGUI] Implant Pad + Implanter Related Sprites + Slight Implant refactor #18556

Merged
merged 17 commits into from
Sep 3, 2022

Conversation

Sirryan2002
Copy link
Contributor

@Sirryan2002 Sirryan2002 commented Jul 25, 2022

What Does This PR Do

Does a few things

  1. Adds new sprites for implant cases, the implant pad, and implanters
    -Implant Pad + Case Sprite are of my own work
    -New Implanters were sprited in TG Station #66722 by PestoVerde322
  2. Refactors Implant Code, mostly all just cleanup, implantpad had a few changes, also put an autosurgeon sprite as the base implant icon state so that it's not broken in-game (I know this is "sprite debt" but broken icons cause significant client lag upon examination/display)
  3. Removes the ID var on tracking implants as they did absolute jack shit
  4. Ensures all Implants have implanters and implant cases defined in the code
  5. Ports the Implantpad to TGUI
  6. Fixes Labor Points Console broken since TGUI merge #18693

Why It's Good For The Game

Sometimes you just need to update some crusty ass sprites that have outlived their time period. Also it's nice to have more code brought up to modern styling standards.

Project Progression -> #18493 and #14968

Images of changes

Lovely Images

ImplantCompare

padnocase

padcasenoimplant

padimplant

padimplant2

Next things on my shitlist after this PR

  1. Implant Chair
  2. Locater

Changelog

🆑
add: Adds implanters + implant cases for every implanter implant available
del: Removed ID setter on implantpad
tweak: Implant Pad is now TGUI instead of browserUI
imageadd: Implant Cases have new sprites
imageadd: Implanters have new sprites
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jul 25, 2022
@AffectedArc07 AffectedArc07 added Refactor This PR will clean up the code but have the same ingame outcome User Interface This PR modifies a user interface in the game TGUI This PR modifies TGUI, will conflict Project Progression labels Jul 25, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jul 25, 2022
@S34NW
Copy link
Member

S34NW commented Jul 25, 2022

This might be out of scope, but could we perhaps rename these from "implants" to differentiate from the surgery-implanted implants? (eye-shield, nodrop, CNS, etc.)

@Sirryan2002
Copy link
Contributor Author

Sirryan2002 commented Jul 25, 2022

This might be out of scope, but could we perhaps rename these from "implants" to differentiate from the surgery-implanted implants? (eye-shield, nodrop, CNS, etc.)

I really don't want to up the files changed on this PR by 30 files + a couple map edits, unless you mean just changing their name variable?

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
@S34NW
Copy link
Member

S34NW commented Jul 25, 2022

This might be out of scope, but could we perhaps rename these from "implants" to differentiate from the surgery-implanted implants? (eye-shield, nodrop, CNS, etc.)

I really don't want to up the files changed on this PR by 30 files + a couple map edits, unless you mean just changing their name variable?

Yeah just renaming them to the end user, coders will already know it's a different item.

@S34NW
Copy link
Member

S34NW commented Jul 25, 2022

You could, for example, call them "microchips" or something

@Sirryan2002
Copy link
Contributor Author

You could, for example, call them "microchips" or something

Would prefer to change the name of cybernetik implants over changing these ones. That will need to be done in a separate PR

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jul 26, 2022
@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Jul 28, 2022
@Sirryan2002
Copy link
Contributor Author

will try and get to this soonish

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Aug 5, 2022
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

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

Mostly nits, especially some of the stuff with the fluff. Looks good in general.

code/game/objects/items/weapons/implants/implant.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implant_dust.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implantfluff.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implantfluff.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implantfluff.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implantfluff.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/implants/implantfluff.dm Outdated Show resolved Hide resolved
@Sirryan2002
Copy link
Contributor Author

Will have requested changes done in the next 3-4 days. Currently dealing with a 40 hour work week 💀

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Copy link
Member

@SteelSlayer SteelSlayer left a comment

Choose a reason for hiding this comment

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

Partial review for now.

I didn't want spam suggestions for calling . = ..() at the start of Initialize(), but can you could please go over all the places where you changed /New to /Initialize and make that change?

code/game/machinery/computer/prisoner.dm Show resolved Hide resolved
code/game/objects/items/weapons/implants/implant_dust.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Aug 15, 2022
Sirryan2002 and others added 3 commits August 18, 2022 14:25
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
@Sirryan2002
Copy link
Contributor Author

still need to fix issues with uplink implants due to conflicts

@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Aug 25, 2022
@Sirryan2002
Copy link
Contributor Author

I promise I'm not forgetting about this PR, just working through early university setup stuff atm

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Aug 31, 2022
Copy link
Member

@hal9000PR hal9000PR left a comment

Choose a reason for hiding this comment

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

this + steels comments please.

@Sirryan2002 Sirryan2002 requested a review from hal9000PR August 31, 2022 14:27
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Sep 3, 2022
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Refactor This PR will clean up the code but have the same ingame outcome TGUI This PR modifies TGUI, will conflict User Interface This PR modifies a user interface in the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Labor Points Console broken since TGUI merge
9 participants