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

Enemies and Allies Content Port #956

Merged
merged 17 commits into from
Sep 26, 2024
Merged

Enemies and Allies Content Port #956

merged 17 commits into from
Sep 26, 2024

Conversation

fenndragon
Copy link
Contributor

@fenndragon fenndragon commented Sep 23, 2024 •
edited
Loading

Description

This is a batch of changes I made for Floof station being ported over to the upstream branch

Changelog

🆑

  • add: Added new neutral xenos, events, and reagent slimes

@fenndragon
batch changes
913c84c 
batch of changes I made for Floof station ported over to the upstream branch
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Sep 23, 2024
@fenndragon fenndragon marked this pull request as draft September 23, 2024 20:30
@SimpleStation14 SimpleStation14 changed the title batch changes Batch Changes Sep 23, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 23, 2024 •
edited
Loading

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

Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi

State Old New Status
crit Modified
dead Modified
running Modified
sleeping Modified

Resources/Textures/Mobs/Animals/patriarch.rsi

State Old New Status
patriarch Added
patriarch_crit Added
patriarch_dead Added
patriarch_sleeping Added

Resources/Textures/Mobs/Animals/subject7355.rsi

State Old New Status
glow Added
subject7355 Added
subject7355_crit Added
subject7355_dead Added
subject7355_sleeping Added

Edit: diff updated after 28d3e2b

SleepyScarecrow
SleepyScarecrow suggested changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@SleepyScarecrow SleepyScarecrow left a comment

Choose a reason for hiding this comment

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

just nitpicky directory stuff from me :3

Resources/Prototypes/Floof/Body/Organs/Friendstomach.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Body/Prototypes/Friendshaped.yml Outdated Show resolved Hide resolved
@fenndragon
folder moved
b0205c0 
folders moved appropriately
@fenndragon
fix
3824ed6 
fixed file structure
@fenndragon fenndragon marked this pull request as ready for review September 23, 2024 21:46
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Sep 23, 2024
Mnemotechnician
Mnemotechnician suggested changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

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

The entire changelog should be just 1-2 entries, and should not include technical details.

@fenndragon
Copy link
Contributor Author

The entire changelog should be just 1-2 entries, and should not include technical details.

better?

@Mnemotechnician
Copy link
Contributor

It should also be descriptive for someone who's reading it in the menu. "Added new neutral xeno prototypes for admins to use in events" or something similar would be good.

@fenndragon
Copy link
Contributor Author

It should also be descriptive for someone who's reading it in the menu. "Added new neutral xeno prototypes for admins to use in events" or something similar would be good.

I listed a bit better what all was added but I did it in one entry, better?

Mnemotechnician
Mnemotechnician approved these changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

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

Yea, that's fine now.

FoxxoTrystan
FoxxoTrystan reviewed Sep 24, 2024
View reviewed changes
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Except for Rouney Sprite, i dont think those additions are needed.

Those Neutral things were things you done mostly for floof, il let solidus view it.

@FoxxoTrystan FoxxoTrystan added Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Type: Port Brings something to here from another codebase labels Sep 24, 2024
@fenndragon
Copy link
Contributor Author

Except for Rouney Sprite, i dont think those additions are needed.

Those Neutral things were things you done mostly for floof, il let solidus view it.

it was requested.

@VMSolidus
Copy link
Member

Or well, it would be when the Linter fail is fixed. That's legitimate.

@fenndragon
Copy link
Contributor Author

Or well, it would be when the Linter fail is fixed. That's legitimate.

whoops forgot to change the texture paths, my bad

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Sep 25, 2024
@fenndragon
Update xenopet.yml
6d9251b 
added 3 more spawn types for vent critters 

Signed-off-by: fenndragon <[email protected]>
@fenndragon
Update vent-critters.ftl
8d1a284 
added all event text 

Signed-off-by: fenndragon <[email protected]>
@fenndragon
Copy link
Contributor Author

went ahead and just added 3 more events and fixed the event text in the locale while I was thinking about it

@fenndragon
Update xeno.yml
08287ac 
Signed-off-by: fenndragon <[email protected]>
@fenndragon
Update xenopet.yml
d714f5e 
Signed-off-by: fenndragon <[email protected]>
FoxxoTrystan
FoxxoTrystan reviewed Sep 25, 2024
View reviewed changes
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

New Events in general just remove all the uniquness of anomalies that can spawn it ect...
And some of them does not fit, i would not approve something like this, review goes to others for it.

Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml Show resolved Hide resolved
@fenndragon
Copy link
Contributor Author

New Events in general just remove all the uniquness of anomalies that can spawn it ect... And some of them does not fit, i would not approve something like this, review goes to others for it.

that's fine, and I was going to leave it at that but it was then requested as a feature personally by others to port it upstream so that's what I'm doing.

@SleepyScarecrow
found it
db77af7 
capitalized the sprite target

Signed-off-by: SleepyScarecrow <[email protected]>
@fenndragon
Update Rslimes.yml
143d0ee 
Signed-off-by: fenndragon <[email protected]>
@fenndragon
Update elemental.yml
68095ac 
Signed-off-by: fenndragon <[email protected]>
@fenndragon
Update Rslimes.yml
28d3e2b 
Signed-off-by: fenndragon <[email protected]>
@fenndragon fenndragon changed the title Batch Changes Enemies and Allies Content Port Sep 26, 2024
@VMSolidus VMSolidus merged commit af0c932 into Simple-Station:master Sep 26, 2024
14 checks passed
SimpleStation14 added a commit that referenced this pull request Sep 26, 2024
@SimpleStation14
Automatic Changelog Update (#956)
883352e
@Mnemotechnician Mnemotechnician mentioned this pull request Sep 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan left review comments

@SleepyScarecrow SleepyScarecrow SleepyScarecrow approved these changes

@OldDanceJacket OldDanceJacket OldDanceJacket approved these changes

@VMSolidus VMSolidus VMSolidus approved these changes

@Peptide90 Peptide90 Awaiting requested review from Peptide90

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

@Mnemotechnician Mnemotechnician Awaiting requested review from Mnemotechnician

Assignees

@fenndragon fenndragon

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@fenndragon @Mnemotechnician @VMSolidus @FoxxoTrystan @OldDanceJacket @SleepyScarecrow