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

Everybody Needs a Kiss #179

Merged
merged 9 commits into from
Sep 29, 2024
Merged

Everybody Needs a Kiss #179

merged 9 commits into from
Sep 29, 2024

Conversation

neuPanda
Copy link
Contributor

@neuPanda neuPanda commented Sep 7, 2024

Description.
added kiss interaction and texts
added lick interaction and texts

🆑

  • add: Kiss an Lick

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Sep 7, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Everybody needs a kiss Everybody Needs a Kiss Sep 7, 2024
Mnemotechnician
Mnemotechnician requested changes Sep 7, 2024
View reviewed changes
Copy link
Collaborator

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

Same applies to the second action-

Resources/Prototypes/Floof/Interactions/noop_interactions.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Interactions/noop_interactions.yml Outdated
hideByRequirement: true
requirement:
!type:MobStateRequirement
inverted: true
Copy link
Collaborator

Choose a reason for hiding this comment

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

You don't want this to be usable on dead bodies. Probably.

Suggested change
inverted: true
allowedStates: [Alive, Critical]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

:( no, there are people who are going to want that

@Mnemotechnician
Copy link
Collaborator

Simple-Station/Einstein-Engines#823 has been merged and is going to be included in #178, so uh please update those later to add some kinda moodlet.

@Fansana
Copy link
Owner

Fansana commented Sep 10, 2024

#178 is added please revisit this

@Mnemotechnician Mnemotechnician mentioned this pull request Sep 13, 2024
Merged
@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Sep 14, 2024
@neuPanda
Copy link
Contributor Author

i fuckin hate yml

@Memeji
Copy link
Collaborator

Memeji commented Sep 14, 2024

What is the current status for this PR?

ShatteredSwords
ShatteredSwords reviewed Sep 16, 2024
View reviewed changes
Copy link
Contributor

@ShatteredSwords ShatteredSwords left a comment

Choose a reason for hiding this comment

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

The kiss and lick make a hug sound. If this is a limitation or if it is hard to find these, that is totally fair. If you think you can find a properly licensed sound for each of these actions though, that'd be cool!

@neuPanda
Copy link
Contributor Author

The kiss and lick make a hug sound. If this is a limitation or if it is hard to find these, that is totally fair. If you think you can find a properly licensed sound for each of these actions though, that'd be cool!

not sure where the sounds are or how they work, but i am sure there is something out there.
that said you also got me to go back and look at it and realize i missed a 2 lines in the copy paste that needed to be updated

@ShatteredSwords
Copy link
Contributor

not sure where the sounds are or how they work, but i am sure there is something out there. that said you also got me to go back and look at it and realize i missed a 2 lines in the copy paste that needed to be updated

Base interactions are located here, which is what looks like ties the sound to whatever. Looks like you'd have to make a new base interaction within the Floof folder and parent it to that. Completely up to you of course! I think we could do it in the future just as easily!

@Mnemotechnician
Copy link
Collaborator

There's no need to create new bases unless you intend to re-use them

@neuPanda
Copy link
Contributor Author

I need to run everything again after the changes i did yesterday just have not had a chance to open VS yet. it was just an issue i saw in the PR, so i did the quick fix remotely and do still intend to test it

@Memeji
Copy link
Collaborator

Memeji commented Sep 19, 2024

I need to run everything again after the changes i did yesterday just have not had a chance to open VS yet. it was just an issue i saw in the PR, so i did the quick fix remotely and do still intend to test it

Any update on this?

@neuPanda
Copy link
Contributor Author

I need to run everything again after the changes i did yesterday just have not had a chance to open VS yet. it was just an issue i saw in the PR, so i did the quick fix remotely and do still intend to test it

Any update on this?

sorry not yet, been busy with work

@github-actions github-actions bot added the Changes: Audio Changes any ogg files label Sep 19, 2024
@neuPanda
Copy link
Contributor Author

audio's have been updated

@ShatteredSwords
Copy link
Contributor

I will test this when I have the chance, very excited!

ShatteredSwords
ShatteredSwords reviewed Sep 20, 2024
View reviewed changes
Copy link
Contributor

@ShatteredSwords ShatteredSwords left a comment

Choose a reason for hiding this comment

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

Sounds don't seem to be working, still uses the default sounds after playtesting. Not sure why! Everything else still is good though.

@Memeji
Copy link
Collaborator

Memeji commented Sep 26, 2024

Were the above suggestions / conversations resolved?

@neuPanda
Copy link
Contributor Author

Were the above suggestions / conversations resolved?

not yet. IRL has been hitting me hard. I have been more focused on how to come up with 30K for how to repair the house than i am the correct way to kiss somebody

@Memeji
Copy link
Collaborator

Memeji commented Sep 26, 2024

Were the above suggestions / conversations resolved?

not yet. IRL has been hitting me hard. I have been more focused on how to come up with 30K for how to repair the house than i am the correct way to kiss somebody

Take the time you need. Apologies if I sound like I'm rushing, I don't intend to do so, just see where the PR stands at the moment. Focus on the more important things there, hoping all the best.

@neuPanda
Copy link
Contributor Author

Take the time you need. Apologies if I sound like I'm rushing, I don't intend to do so, just see where the PR stands at the moment. Focus on the more important things there, hoping all the best.

no worries, i think i may have sounded more aggressive than i was, i didn't feel like you were rushing me, I'm just ready to throw hands at the world. unless shit hits the fan again today, i want to get this cleaned up when i get off work today so it can be in for the weekend

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Sep 27, 2024
@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 Sep 27, 2024
@Fansana Fansana merged commit 92aa536 into Fansana:master Sep 29, 2024
11 checks passed
Floof-Station-Bot added a commit that referenced this pull request Sep 29, 2024
@Floof-Station-Bot
Automatic Changelog Update (#179)
cb2fa5e
@FoxxoTrystan
Copy link
Collaborator

Why this was merged without approval?
Aaa

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

@ShatteredSwords ShatteredSwords ShatteredSwords left review comments

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

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

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

Assignees

@neuPanda neuPanda

Labels
Changes: Audio Changes any ogg files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@neuPanda @Mnemotechnician @Fansana @Memeji @ShatteredSwords @FoxxoTrystan