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

Harmony Xeno Beta v1.3 Playtest #27

Merged
merged 12 commits into from
Oct 6, 2024

Conversation

SlamBamActionman
Copy link

@SlamBamActionman SlamBamActionman commented Sep 4, 2024

About the PR

Contains all files necessary to playtest the map Xeno.

File changes:

  • Adds Xeno to PostMapInitTest
  • The Enabled property for ContainmentFieldGeneratorComponent is now a DataField, allowing it to be turned on roundstart. Includes the logic required for it. (Already PR'd upstream)

Additions:

  • Xeno Floor and Dark Techmaint Floor
  • Blood and Fluorosulfuric Acid puddles prototypes
  • RustedThruster, a cosmetic structure
  • AirAlarmXeno and FireAlarmXeno, xeno-themed versions of the normal alarms
  • Solid Chitin and Reinforced Chitin, xeno-themed versions of Solid Wall and Reinforced Wall. Can be deconstructed into girders, but not remade into Chitin walls.
  • The "Full" decal, a square decal for coloring an entire tile.
  • Xeno spawner (Spawns a custom Praetorian upon map init)
    • This Praetorian is located in a remote area on the station. It has custom stats that make it relatively non-lethal and more of a scare for unsuspecting players.
  • "Spent .35 cartridge" prototype
  • Atmos directional sign (Already PR'd upstream)

Media

xeno-0

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑

  • add: Xeno map Beta is available for playtest on Harmony.

@Nonagon44
Copy link
Collaborator

Nonagon44 commented Sep 5, 2024

Hey looks good.
I'll wait for kelds word on this one personaly but I love the design.

Good work!

@KeldWolf
Copy link

KeldWolf commented Sep 5, 2024

I mostly need to make sure merging this doesn't cause some catastrophically hard to untangle merges in the future. Currently all harmony specific assets are in their respective harmony folders in order to not get clobbered when changes get merged from upstream. So it may take some time for me to go over each file changed and make sure none of it is going to cause the build to explode if something changes upstream. Hope to get it into harmony though!

@Nonagon44
Copy link
Collaborator

Nonagon44 commented Sep 5, 2024

Yeah for sure. Looks like this map has a few unique assets so.

@FluffMe
Copy link
Collaborator

FluffMe commented Sep 12, 2024

@KeldWolf I'll take a look and see if i can make it fully detached from the upstream code base

@github-actions github-actions bot added the S: Merge Conflict Merge conflict detected label Sep 19, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@FluffMe
Copy link
Collaborator

FluffMe commented Sep 20, 2024

@SlamBamActionman Hi!

Unfortunately, I had no time to get to this myself.

Please move everything you can to Harmony namespace. Same as you did for Umbra. And it looks like a merge to a fresher upstream master is in order.
After that we should be able to make this work! Otherwise, I'll find time to move stuff around when I do.

Thanks! This is a very cool map.

@SlamBamActionman
Copy link
Author

@SlamBamActionman Hi!

Unfortunately, I had no time to get to this myself.

Please move everything you can to Harmony namespace. Same as you did for Umbra. And it looks like a rebase to a fresher upstream is in order. After that we should be able to make this work! Otherwise, I'll find time to move stuff around when I do.

Thanks! This is a very cool map.

Heya, thanks for taking the time to look things over and provide feedback. I can definitely move things around, it shouldn't be an issue. 👍

The map recently went through another playtest and should be updated to reflect feedback first, but once I've done that I will update this PR following the folder recommendation.

@FluffMe
Copy link
Collaborator

FluffMe commented Sep 30, 2024

@SlamBamActionman
Slam, for when you back working on it.

FYI: #92

@FluffMe FluffMe marked this pull request as draft October 2, 2024 00:54
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs
#	Resources/Maps/xeno.yml
#	Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
#	Resources/Prototypes/Maps/xeno.yml
@SlamBamActionman SlamBamActionman marked this pull request as ready for review October 5, 2024 22:17
@github-actions github-actions bot removed the S: Merge Conflict Merge conflict detected label Oct 5, 2024
@SlamBamActionman
Copy link
Author

This PR should now be ready for review; files have been moved to _Harmony folders where possible, and where not they've been marked via comments.

@FluffMe
Copy link
Collaborator

FluffMe commented Oct 5, 2024

Appreciate it! We'll get on reading!

@FluffMe FluffMe self-requested a review October 5, 2024 22:23
@github-actions github-actions bot added the S: Needs Review Review is requested label Oct 5, 2024
@FluffMe FluffMe requested a review from KeldWolf October 5, 2024 22:26
FluffMe
FluffMe previously requested changes Oct 6, 2024
Copy link
Collaborator

@FluffMe FluffMe left a comment

Choose a reason for hiding this comment

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

To sum up.
Important stuff

  • 2 linter fails (so far) should be addressed.

Optional based on your best judgment

  • Maybe WallSolidChitin and its RSI Structures/Walls/xeno.rsi can be moved.
  • Maybe Resources/Maps/xeno.yml and Resources/Maps/Shuttles/cargo_xeno.yml and references to them can be moved.

I expect this map to end up upstream eventually, since it looks dope and you are a legend.
This should slightly simplify merge and cleanup a bit when that merge comes, but it's not too big of a deal.

Please let me know what you think, and I can't wait to play this!

@SlamBamActionman
Copy link
Author

Thanks for reviewing, I should have moved all requested files and fixed all Linter errors now :)

@FluffMe FluffMe dismissed their stale review October 6, 2024 13:26

Changes addressed

@FluffMe
Copy link
Collaborator

FluffMe commented Oct 6, 2024

I'll ask @KeldWolf to take a final look, and it's good to go!

@FluffMe
Copy link
Collaborator

FluffMe commented Oct 6, 2024

@SlamBamActionman might wanna rename the PR to have correct Xeno version in the name. Seems to be 1.3 or 1.3.something. You know better for sure!

Copy link

@KeldWolf KeldWolf left a comment

Choose a reason for hiding this comment

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

Thanks for you work getting this ready in a way that won't potentially cause us headaches down the road. I'll approve this for trying out on Harmony now.

@SlamBamActionman SlamBamActionman changed the title Harmony Xeno Beta v1.2.2 Playtest Harmony Xeno Beta v1.3 Playtest Oct 6, 2024
@SlamBamActionman
Copy link
Author

Great, let me know on Discord whenever a playtest for this station is scheduled, I'll make time whenever! :)

@FluffMe FluffMe merged commit a46ece1 into ss14-harmony:master Oct 6, 2024
12 checks passed
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.

4 participants