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

Xenofriends #145

Merged
merged 35 commits into from
Sep 9, 2024
Merged

Xenofriends #145

merged 35 commits into from
Sep 9, 2024

Conversation

fenndragon
Copy link
Contributor

@fenndragon fenndragon commented Aug 24, 2024

Description

Adds friendly Xeno spawns alongside friendshape and even a few passive xeno mobs


Changelog

🆑

  • Add: a collection of Passive Xenos
  • Add: several New friendly Xeno experimental subjects much like Friend-shaped.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 24, 2024
Copy link
Contributor

github-actions bot commented Aug 24, 2024

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

Resources/Textures/Floof/Mobs/Animals/patriarch.rsi

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

Resources/Textures/Floof/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 af9752d

@fenndragon fenndragon marked this pull request as draft August 24, 2024 02:50
custom sprites for some of the xenos
@fenndragon fenndragon marked this pull request as ready for review August 24, 2024 02:56
Mnemotechnician pushed a commit to Mnemotechnician/floofstation that referenced this pull request Aug 24, 2024
Leadup to PR #656. The Loadout fix for Fansana#145. Adds and makes a lot of
loadout options for Security. Full Change Log Below:

**Change Notes:**

- Changed Wizden Security Vest sprites to DeltaV Sprites.

- Removed Wizden Security Vests from loadouts (can be re-added later in
another PR if sentiment changes.)

- Added Plate Carriers and Durathread Vests to loadouts

- Made non-specialist Security apparel generic to Security. Charge
Batong with style now!

- Added Flashes to Security Loadouts.

- Added Security Armor Vests to Security Loadouts.

- Added Detective Coats and Vests to Security Loadouts.

- Added Warden Armored Jacket to Warden Loadouts.

- Added Head of Security's Trenchcoat to Loadouts.

- Added Security gear & accessories to Loadouts.

- Added Brigmedic and Corpsman items for Corpsman!

- Added SecGlasses to Loadouts!

---------

Signed-off-by: Tmanzxd <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
sprites for the friendly xenos
slight text fix
Copy link
Collaborator

@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.

This looks sadly like a mess, please avoid making inventories for xenos.

If you wana make Xenos Neutral/Pet please do what you have done in line 24 to 71 with all xenos

To add the new xenos, please add them in the xeno.yml and neutral/pet version in the xenopet.yml

Theres double files of the textures, please delete the doubles.

Failed Tests are valid, this need to be resolved.

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes Priority: 3-Low Should be resolved at some point and removed Status: Needs Review Someone please review this labels Aug 24, 2024
@fenndragon
Copy link
Contributor Author

This looks sadly like a mess, please avoid making inventories for xenos.

If you wana make Xenos Neutral/Pet please do what you have done in line 24 to 71 with all xenos

To add the new xenos, please add them in the xeno.yml and neutral/pet version in the xenopet.yml

Theres double files of the textures, please delete the doubles.

Failed Tests are valid, this need to be resolved.

have been trying to work out where the fails are, any assistance would be appreciated.

@fenndragon
Copy link
Contributor Author

This looks sadly like a mess, please avoid making inventories for xenos.

If you wana make Xenos Neutral/Pet please do what you have done in line 24 to 71 with all xenos

To add the new xenos, please add them in the xeno.yml and neutral/pet version in the xenopet.yml

Theres double files of the textures, please delete the doubles.

Failed Tests are valid, this need to be resolved.

also the new/duplicated sprite (patriarch) is a placeholder to go ahead and set up the file path when I choose to actually alter his sprite. (was thinking of some scars or markings)

@DakoDemon
Copy link
Contributor

DakoDemon commented Aug 26, 2024

Gonna give this a look-see to see what's throwing errors. I did some of the code as well.

As for the duplicate sprites, the current pet ones are placeholder for later sprite changes, so they get their own sprites. Similar to how Ian is worked. As for the inventory slots, they have an ID card slot, and a pocket. Which is... Less then a lot of other pets out there. We can remove them if needed, I just thought being able to give a Xeno an actual ID card would make random friendly fire incidents a little less common.

altered the base xenos puller to not require them to have hands
@fenndragon
Copy link
Contributor Author

pretty sure that's a false positive

@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Aug 28, 2024
@Mnemotechnician
Copy link
Contributor

it is, test fail is fake.

@Mnemotechnician
Copy link
Contributor

Also, that entire cl should certainly be compressed into

:cl:
- add: Added several new xenomorph spawns for admins.

@Fansana
Copy link
Owner

Fansana commented Aug 29, 2024

I haven't looked much at this but I want to add my 5 cents.
Xenos should not have pockets.
Xenos should not have hands
Xenos should be able to drag with their tails
Passive Xenos should not spawn naturally.
Passive Xenos should look different from aggressive Xenos. Either by size or color.

@DakoDemon
Copy link
Contributor

I haven't looked much at this but I want to add my 5 cents. Xenos should not have pockets. Xenos should not have hands Xenos should be able to drag with their tails Passive Xenos should not spawn naturally. Passive Xenos should look different from aggressive Xenos. Either by size or color.

Sure! I'll go through and help change some of these. I did some of the code changes myself, cause I wanted to add actual like NT Xeno Pets that can be spawned in.
I do understand the pocket thing, I just wanted to give passive Xenos a bit more utility.
The hand was supposed to be a kinda, they're holding it with their mouths type thing, but we can take that out if absolutely neccesary.
Tail-drag was supposed to kinda replace the need for a hand, so definitely agree that that should be kept in.
The only things I'd say should spawn 'naturally' are the pet varients, if ANYTHING, otherwise, yeah, Admin spawn is the easiest.
As for the looks, we CAN go through and add some changes to the sprites if need be, or make them smaller, but we were going for the idea that these are Xenos that have broken off from the Queen and are now their own entity, so they'd still be mostly the same. But yeah! Fenn and I can do some changes. Maybe desaturate their colours some.

Copy link
Collaborator

@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.

I feel InteractionPopup could just be on the default xeno base but il let this go.

Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml Outdated Show resolved Hide resolved
removing the weapon change for neutral rouny
added a colored point light to the different friendly Xenos to make them stand out as per request
@fenndragon
Copy link
Contributor Author

I haven't looked much at this but I want to add my 5 cents. Xenos should not have pockets. Xenos should not have hands Xenos should be able to drag with their tails Passive Xenos should not spawn naturally. Passive Xenos should look different from aggressive Xenos. Either by size or color.

I added a colored point light to each of the neutral Xenos to differentiate them from the regular.

They don't have pockets
They don't have hands
They all have tail puller
they do not spawn naturally.

@fenndragon
Copy link
Contributor Author

weapon thing removed now

@fenndragon
Copy link
Contributor Author

ok it's given me the same failed test every time I've made a change, maybe that's not a false positive? what could be causing that

Copy link
Collaborator

@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.

Code look overall good now heres things to fix those before merge.

Changlog need to be shorter please, more simple like (Added a bunch of new Xenomorph) ect....
PointLight While being very tiny, im not sure that will let peoples know whos friend or not, tho i will leave this to be not approved by me but Floof/Memeji.
Tho i would recomend to do pehaps some sprites changes, pehaps.

@fenndragon
Copy link
Contributor Author

Code look overall good now heres things to fix those before merge.

Changlog need to be shorter please, more simple like (Added a bunch of new Xenomorph) ect....
PointLight While being very tiny, im not sure that will let peoples know whos friend or not, tho i will leave this to be not approved by me but Floof/Memeji.
Tho i would recomend to do pehaps some sprites changes, pehaps.

well, from my experience with pointlight it tints the color of the sprite. which is why I chose to use it as a quickfix for now to allow time for the new sprites to be made.

as for the rest, I'll get set on the changelog

@fenndragon
Copy link
Contributor Author

Code look overall good now heres things to fix those before merge.

Changlog need to be shorter please, more simple like (Added a bunch of new Xenomorph) ect....
PointLight While being very tiny, im not sure that will let peoples know whos friend or not, tho i will leave this to be not approved by me but Floof/Memeji.
Tho i would recomend to do pehaps some sprites changes, pehaps.

alright done~

@fenndragon fenndragon changed the title Xenospawners Xenofriends Sep 3, 2024
SnowyFoxxo pushed a commit to SnowyFoxxo/floofstation1 that referenced this pull request Sep 4, 2024
…ansana#145 (#656)

Partial fix to Fansana#145, as the changes in inventory will need reflected in
the Security Loadout system which will be in another PR.

Made so Detective has the same access as Security Officers.
@Memeji Memeji merged commit d18543a into Fansana:master Sep 9, 2024
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Low Should be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants