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

MODsuits (Port From Goob #1242) #1640

Merged
merged 52 commits into from
Jan 25, 2025

Conversation

Erisfiregamer1
Copy link
Contributor

@Erisfiregamer1 Erisfiregamer1 commented Jan 23, 2025

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

Desktop.2024.12.23.-.10.36.29.03.DVR.-.Trim.mp4

Modsuit sealing

Desktop.2024.12.23.-.10.56.52.05.DVR.-.Trim.mp4


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
Copy link
Contributor

github-actions bot commented Jan 23, 2025

RSI Diff Bot; head commit d89185d merging into 0e309db
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 d89185d

@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

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

@Erisfiregamer1
Copy link
Contributor Author

Erisfiregamer1 commented Jan 25, 2025

@DEATHB4DEFEAT Please either dismiss your review or re-review the PR so it can get merged 🙏

All tests passing,

@DEATHB4DEFEAT
Copy link
Member

womp

@Erisfiregamer1
Copy link
Contributor Author

womp

image

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.

Solve UI comments

@Erisfiregamer1
Copy link
Contributor Author

Solve UI comments

PLEASE DONT DO THIS TO ME

@Erisfiregamer1
Copy link
Contributor Author

All UI comments resolved, ready for merge

@Erisfiregamer1
Copy link
Contributor Author

Erisfiregamer1 commented Jan 25, 2025

The test fails are heisentests

@@ -51,6 +57,27 @@ private void OnPressureImmuneRemove(EntityUid uid, PressureImmunityComponent pre
}
}

// Goobstation - Modsuits - Update component state on toggle
private void OnPressureProtectionChanged(EntityUid uid, PressureProtectionComponent pressureProtection, EntityEventArgs args)
Copy link
Member

Choose a reason for hiding this comment

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

This reminds me that I would LOVE to eventually have a system that makes it so that taking enough damage while wearing space gear makes it lose its pressure protection(Or "Degrade" its pressure protection). That is until the suit is repaired, which is a process that requires you first take the suit off, and either sew back up the kevlar seals if it's a vacsuit, or otherwise weld the holes back shut. That was actually the intended way to differentiate Vacsuits > Hardsuits > Tacsuits > Modsuits

Vacsuits: Cheap as fuck, extremely common. ANY amount of physical damage ruins the protection. You are NOT fighting in these.

Hardsuits: Has extremely significant "Pressure sealing" against anything other than Piercing damage. You can get hit by a rock in space, and the suit will probably still work. Gunfire however will fuck it up. Don't wear one to a gunfight.

Tacsuits: Trades the "Blunt Object Sealing" for "Gunfire Sealing". Can take a burst of machine gun fire and still be able to keep the void of space from boiling off your eyeballs. Don't wear one to a meteor shower.

Modsuits: The tradeoff between Hardsuit & Tacsuit's style of protection is essentially an "Operator's Choice" slider depending on how its configured. I imagine it almost like the comparison between Clan Omnimechs and Inner Sphere Battlemechs. The former's a mech where you basically throw your whole bank account into a furnace to gain the ability to hotswap mech configurations within an hour instead of weeks/months. The latter being cheap industrial quantity manufactured workhorses that are made to do just one thing and be good at only that one thing.

Copy link
Member

Choose a reason for hiding this comment

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

Don't consider this comment to be a requirement by the way, just musings.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That would be awesome and I agree. Maybe in PR 2 (general touch-ups)?

Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't, I have an idea for it already

Content.Server/Body/Systems/LungSystem.cs Outdated Show resolved Hide resolved
Content.Server/Body/Systems/LungSystem.cs Outdated Show resolved Hide resolved
Erisfiregamer1 and others added 3 commits January 25, 2025 11:37
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
Update required on comp, doing that now

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
…enu.xaml.cs

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
Erisfiregamer1 and others added 2 commits January 25, 2025 11:42
OK

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
@Erisfiregamer1
Copy link
Contributor Author

{FF545683-D5BD-40F7-A059-6FDB73579C1A}
What's next, Remuchi requesting changes?

@VMSolidus VMSolidus dismissed stale reviews from sleepyyapril and DEATHB4DEFEAT January 25, 2025 17:04

stale

@Erisfiregamer1
Copy link
Contributor Author

Heisentest

@VMSolidus VMSolidus merged commit cb06c41 into Simple-Station:master Jan 25, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants