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.

Sign up for GitHub

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

Jump to bottom

MODsuits (Port From Goob #1242) #1640

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

MODsuits (Port From Goob #1242) #1640

wants to merge 43 commits into from
+2,690 −184

Conversation

Erisfiregamer1
Copy link
Contributor

@Erisfiregamer1 Erisfiregamer1 commented Jan 23, 2025 •
edited
Loading

Description

Ports MODsuits from Goobstation PR Goob-Station/Goob-Station#1242. The PR author has confirmed that he is okay with me doing this.

TODO

  • Port in sprites
  • Port in YMLs
  • Port code
  • Port code PATCHES
  • Update EE with required fixes

Media

Modsuit crafting:
https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68

Modsuit sealing:
https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134

Changelog

🆑

  • add: Modsuits have been ported from Goobstation!

@Erisfiregamer1 Erisfiregamer1 marked this pull request as ready for review January 23, 2025 01:22
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 23, 2025
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 23, 2025
@SimpleStation14 SimpleStation14 changed the title MODsuits (Port from Goob #1242) MODsuits (Port From Goob #1242) Jan 23, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 23, 2025 •
edited
Loading

RSI Diff Bot; head commit 59c3369 merging into 1ef0bd0
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Goobstation/Actions/modsuit.rsi

State Old New Status
activate-ready Added
activate Added

Resources/Textures/_Goobstation/Clothing/Back/Modsuits/standard.rsi

State Old New Status
control-sealed Added
control Added
equipped-BACKPACK-sealed Added
equipped-BACKPACK Added

Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/standard.rsi

State Old New Status
equipped-HAND-sealed Added
equipped-HAND Added
gauntlets-sealed Added
gauntlets Added

Resources/Textures/_Goobstation/Clothing/Head/Modsuits/standard.rsi

State Old New Status
equipped-HEAD-sealed Added
equipped-HEAD Added
helmet-sealed Added
helmet Added

Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/standard.rsi

State Old New Status
chestplate-sealed Added
chestplate Added
equipped-OUTERCLOTHING-sealed Added
equipped-OUTERCLOTHING Added

Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/standard.rsi

State Old New Status
boots-sealed Added
boots Added
equipped-FEET-sealed Added
equipped-FEET Added

Resources/Textures/_Goobstation/Interface/Alerts/modpower.rsi

State Old New Status
modpower0 Added
modpower1 Added
modpower2 Added
modpower3 Added
modpower4 Added
modpower5 Added

Resources/Textures/_Goobstation/Objects/Specific/Robotics/modsuit_parts.rsi

State Old New Status
boots Added
chestplate Added
gauntlets Added
helmet Added
mod-core-standard Added
shell-boots Added
shell-chestplate Added
shell-core-secured Added
shell-core Added
shell-gauntlets Added
shell-helmet Added
shell-secured Added
shell Added
standard-plating Added

Edit: diff updated after 59c3369

@sleepyyapril
Copy link
Contributor

I know for a fact there's an absolute fuckton of test fails in regards to this: ensure they all die.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: UI Changes any XAML files labels Jan 23, 2025
@Erisfiregamer1
Copy link
Contributor Author

I know for a fact there's an absolute fuckton of test fails in regards to this: ensure they all die.

Why do you think I didn't draft it? I'll have them all dead HOPEFULLY!!! by the time Tyler can review. Hopefully.

@github-actions github-actions bot added the Changes: Map Changes any yml file in the Maps directories label Jan 23, 2025
@Erisfiregamer1
Copy link
Contributor Author

Tests need re-run, they aren't my fault

sleepyyapril
sleepyyapril approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@sleepyyapril sleepyyapril left a comment

Choose a reason for hiding this comment

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

yeah this is honestly mostly fine, i dont see any Crazy issues so we can just fix it as we go

@sleepyyapril
Copy link
Contributor

the test fails are in fact your fault though

@sleepyyapril
Copy link
Contributor

specifically the price ones

@Erisfiregamer1
Copy link
Contributor Author

specifically the price ones

wuh??? i dont even know how that could be my fault?! its talking about refunds when cargo doesnt even have those (only thing added related is the MOD core crate)

@sleepyyapril
Copy link
Contributor

specifically the price ones

wuh??? i dont even know how that could be my fault?! its talking about refunds when cargo doesnt even have those (only thing added related is the MOD core crate)

do you add anything to the uplink

@Erisfiregamer1
Copy link
Contributor Author

specifically the price ones

wuh??? i dont even know how that could be my fault?! its talking about refunds when cargo doesnt even have those (only thing added related is the MOD core crate)

do you add anything to the uplink

no

@sleepyyapril
Copy link
Contributor

reran

@DEATHB4DEFEAT
Copy link
Member

need media

@Erisfiregamer1
Copy link
Contributor Author

need media

take it from goob :godo:

DEATHB4DEFEAT
DEATHB4DEFEAT requested changes Jan 24, 2025
View reviewed changes
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

The consistency of the goobspace comments sucks but whatever

Content.Client/_Goobstation/Clothing/EntitySystems/SealableClothingVisualizerSystem.cs Outdated Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml Outdated Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs Show resolved Hide resolved
Content.Shared/_Goobstation/Wires/Systems/RequirePanelSystem.cs Outdated Show resolved Hide resolved
Content.Shared/_Goobstation/Wires/Systems/RequirePanelSystem.cs Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Structures/Power/chargers.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml Outdated Show resolved Hide resolved
@Erisfiregamer1 @DEATHB4DEFEAT
GET ME OUT OF THIS GODFORSAKEN REVIEW
f024c58 
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: Eris <[email protected]>
Erisfiregamer1
Erisfiregamer1 commented Jan 24, 2025
View reviewed changes
Copy link
Contributor Author

@Erisfiregamer1 Erisfiregamer1 left a comment

Choose a reason for hiding this comment

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

Resolved shit

Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml Outdated Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs Show resolved Hide resolved
Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs Show resolved Hide resolved
Content.Shared/DoAfter/DoAfterArgs.cs Show resolved Hide resolved
@Erisfiregamer1
Copy link
Contributor Author

death you have sentenced me to a sleepless night I hope you know that

@DEATHB4DEFEAT
Copy link
Member

death you have sentenced me to a sleepless night I hope you know that

:godmode:

@Erisfiregamer1
Copy link
Contributor Author

Testfail is heisen and all of Death's comments are resolved, waiting for a review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sleepyyapril sleepyyapril sleepyyapril approved these changes

@VMSolidus VMSolidus Awaiting requested review from VMSolidus VMSolidus is a code owner

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi is a code owner

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: 2-Large For large issues/PRs Status: Do Not Merge Do not merge Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Erisfiregamer1 @sleepyyapril @DEATHB4DEFEAT @Remuchi