Skip to content

Commit

Permalink
Merge pull request #179 from neuPanda/kiss-your-captain
Browse files Browse the repository at this point in the history
Everybody Needs a Kiss
  • Loading branch information
Fansana authored Sep 29, 2024
2 parents dadeb94 + 730ccd9 commit 92aa536
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 0 deletions.
Binary file added Resources/Audio/Floof/Lewd/kiss.ogg
Binary file not shown.
Binary file added Resources/Audio/Floof/Lewd/lick.ogg
Binary file not shown.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/Floof/mood/mood.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mood-effect-BeingKissed = That kiss was delightful.
mood-effect-BeingLicked = I've been Licked!
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
interaction-Kiss-name = Kiss
interaction-Kiss-description = A kiss melts the pains away.
interaction-Kiss-success-self-popup = You kiss {THE($target)}.
interaction-Kiss-success-target-popup = {THE($user)} kisses you.
interaction-Kiss-success-others-popup = {THE($user)} kisses {THE($target)}.
interaction-Lick-name = Lick
interaction-Lick-description = Lick your co-worker, what HR?.
interaction-Lick-success-self-popup = You lick {THE($target)}.
interaction-Lick-success-target-popup = {THE($user)} licks you.
interaction-Lick-success-others-popup = {THE($user)} licks {THE($target)}.
36 changes: 36 additions & 0 deletions Resources/Prototypes/Floof/Interactions/mood_interactions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: Interaction
id: Kiss
parent: [BaseGlobal, BaseHands]
priority: -1
delay: 0.4
range: {max: 1}
hideByRequirement: true
requirement:
!type:MobStateRequirement
inverted: true
action:
# TODO: this should pull the target closer or sumth, but I need to code that action first
!type:MoodAction
effect: BeingKissed
effectSuccess:
popup: Obvious
sound: {path: /Audio/Floof/Lewd/kiss.ogg}

- type: Interaction
id: Lick
parent: [BaseGlobal, BaseHands]
priority: -2
#icon: /Textures/Interface/Actions/hug.png
delay: 0.7
range: {max: 1}
hideByRequirement: true
requirement:
!type:MobStateRequirement
inverted: true
action:
# TODO: this should pull the target closer or sumth, but I need to code that action first
!type:MoodAction
effect: BeingLicked
effectSuccess:
popup: Obvious
sound: {path: /Audio/Floof/Lewd/lick.ogg}
11 changes: 11 additions & 0 deletions Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: moodEffect
id: BeingKissed
moodChange: 4
timeout: 120
category: PositiveInteraction

- type: moodEffect
id: BeingLicked
moodChange: 4
timeout: 120
category: PositiveInteraction

0 comments on commit 92aa536

Please sign in to comment.