diff --git a/Resources/Locale/en-US/_lust/interactions/categories.ftl b/Resources/Locale/en-US/_lust/interactions/categories.ftl index 06d6fd5ad50..1dd298baab9 100644 --- a/Resources/Locale/en-US/_lust/interactions/categories.ftl +++ b/Resources/Locale/en-US/_lust/interactions/categories.ftl @@ -10,7 +10,6 @@ lust-interaction-category-Lips = Lips lust-interaction-category-Mouth = Mouth lust-interaction-category-Pussy = Pussy lust-interaction-category-Thighs = Thighs -lust-interaction-category-Wings = Wings lust-interaction-category-Dildos = Dildos lust-interaction-category-Fleshlights = Fleshlights lust-interaction-category-Legs = Legs diff --git a/Resources/Locale/en-US/_lust/interactions/icons.ftl b/Resources/Locale/en-US/_lust/interactions/icons.ftl index bfaf50e9456..6d9b98f2e1f 100644 --- a/Resources/Locale/en-US/_lust/interactions/icons.ftl +++ b/Resources/Locale/en-US/_lust/interactions/icons.ftl @@ -66,3 +66,7 @@ lust-interaction-icon-ToyPussyIcon = Toy (pussy) lust-interaction-icon-BoobsManyKissesIcon = Many kisses (breasts) lust-interaction-icon-CheeksKissIcon = Cheek kiss lust-interaction-icon-CockTongueFap = Tongue on cock +lust-interaction-icon-WingKiss = Wing kiss +lust-interaction-icon-WingLick = Wing lick +lust-interaction-icon-WingStrokeCrotch = Stroke crotch with wing +lust-interaction-icon-WingsCockFap = Stroke cock with wing \ No newline at end of file diff --git a/Resources/Locale/en-US/_lust/interactions/interactions.ftl b/Resources/Locale/en-US/_lust/interactions/interactions.ftl index 2916b46abdd..ccf8b3690e5 100644 --- a/Resources/Locale/en-US/_lust/interactions/interactions.ftl +++ b/Resources/Locale/en-US/_lust/interactions/interactions.ftl @@ -134,3 +134,10 @@ lust-interaction-ERPtoyPlaceholderFleshflight1 = Insert cock into pussy lust-interaction-ERPSelftoyPlaceholderFleshflight1 = Insert cock into pussy lust-interaction-ERPSelftoyPlaceholderDildo = Insert dildo into anus lust-interaction-ERPSelftoyPlaceholderDildo2 = Insert dildo into pussy + +lust-interaction-WingsKiss = Kiss wings +lust-interaction-WingsLick = Lick wings +lust-interaction-WingsStrokeCrotch = Stroke crotch with wing +lust-interaction-WingsCockFap = Stroke cock with wing +lust-interaction-WingsPussyFuck = Fuck pussy while holding wings +lust-interaction-WingsAssFuck = Fuck anus while holding wings \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_lust/interactions/categories.ftl b/Resources/Locale/ru-RU/_lust/interactions/categories.ftl index d5df803e7ab..3641166e4b9 100644 --- a/Resources/Locale/ru-RU/_lust/interactions/categories.ftl +++ b/Resources/Locale/ru-RU/_lust/interactions/categories.ftl @@ -10,7 +10,6 @@ lust-interaction-category-Lips = Губы lust-interaction-category-Mouth = Рот lust-interaction-category-Pussy = Вагина lust-interaction-category-Thighs = Ляжки -lust-interaction-category-Wings = Крылья lust-interaction-category-Dildos = Дилдо lust-interaction-category-Fleshlights = Искусственная вагина lust-interaction-category-Legs = Ножки diff --git a/Resources/Locale/ru-RU/_lust/interactions/icons.ftl b/Resources/Locale/ru-RU/_lust/interactions/icons.ftl index e9ff23cc7c0..03757dbb54e 100644 --- a/Resources/Locale/ru-RU/_lust/interactions/icons.ftl +++ b/Resources/Locale/ru-RU/_lust/interactions/icons.ftl @@ -66,3 +66,7 @@ lust-interaction-icon-ToyPussyIcon = Игрушка (киска) lust-interaction-icon-BoobsManyKissesIcon = Много поцелуев (грудь) lust-interaction-icon-CheeksKissIcon = Поцелуй щёк lust-interaction-icon-CockTongueFap = Ласкание члена языком +lust-interaction-icon-WingKiss = Поцелуй крыльев +lust-interaction-icon-WingLick = Облизывание крыльев +lust-interaction-icon-WingStrokeCrotch = Погладить промежность крылом +lust-interaction-icon-WingsCockFap = Погладить член крылом \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_lust/interactions/interactions.ftl b/Resources/Locale/ru-RU/_lust/interactions/interactions.ftl index 6b88648f184..212ec562fb3 100644 --- a/Resources/Locale/ru-RU/_lust/interactions/interactions.ftl +++ b/Resources/Locale/ru-RU/_lust/interactions/interactions.ftl @@ -134,3 +134,10 @@ lust-interaction-ERPtoyPlaceholderFleshflight1 = Вставить член в к lust-interaction-ERPSelftoyPlaceholderFleshflight1 = Вставить член в киску lust-interaction-ERPSelftoyPlaceholderDildo = Вставить дилдо в анал lust-interaction-ERPSelftoyPlaceholderDildo2 = Вставить дилдо в вагину + +lust-interaction-WingsKiss = Поцеловать крылышки +lust-interaction-WingsLick = Облизать крылышки +lust-interaction-WingsStrokeCrotch = Погладить промежность крылом +lust-interaction-WingsCockFap = Погладить член крылом +lust-interaction-WingsPussyFuck = Трахать вагину держа за крылья +lust-interaction-WingsAssFuck = Трахать анус держа за крылья \ No newline at end of file diff --git a/Resources/Prototypes/_Lust/Interactions/anal.yml b/Resources/Prototypes/_Lust/Interactions/anal.yml index f744b1a3890..56aab5fdb89 100644 --- a/Resources/Prototypes/_Lust/Interactions/anal.yml +++ b/Resources/Prototypes/_Lust/Interactions/anal.yml @@ -1,4 +1,4 @@ -- type: interaction +- type: interaction id: AnalFingering name: lust-interaction-AnalFingering icon: AnalFingeringIcon @@ -166,6 +166,11 @@ checkTarget: true checkInitiator: false layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: false + checkTarget: true + allowedSpecies: [ Moth, Milira ] - !type:BodyAreaTagCondition checkInitiator: true checkTarget: false @@ -208,6 +213,11 @@ checkTarget: false checkInitiator: true layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: true + checkTarget: false + allowedSpecies: [ Moth, Milira ] - !type:BodyAreaTagCondition checkInitiator: false checkTarget: true diff --git a/Resources/Prototypes/_Lust/Interactions/boobs.yml b/Resources/Prototypes/_Lust/Interactions/boobs.yml index 591aab5975b..a5c7dd892a5 100644 --- a/Resources/Prototypes/_Lust/Interactions/boobs.yml +++ b/Resources/Prototypes/_Lust/Interactions/boobs.yml @@ -1,4 +1,4 @@ -- type: interaction +- type: interaction id: BoobsCuddle name: lust-interaction-BoobsCuddle icon: FaceInBoobsIcon @@ -337,6 +337,11 @@ checkTarget: false checkInitiator: true layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: true + checkTarget: false + allowedSpecies: [ Moth, Milira ] interactionMessages: - "%user нежно гладит хвостиком грудь %target" - "%user ласково проводит хвостиком по груди %target" diff --git a/Resources/Prototypes/_Lust/Interactions/butt.yml b/Resources/Prototypes/_Lust/Interactions/butt.yml index 23361a607ba..98184ab458d 100644 --- a/Resources/Prototypes/_Lust/Interactions/butt.yml +++ b/Resources/Prototypes/_Lust/Interactions/butt.yml @@ -1,4 +1,4 @@ -- type: interaction +- type: interaction id: ButtPaw name: lust-interaction-ButtPaw icon: HandsOnButtIcon @@ -224,6 +224,11 @@ checkTarget: false checkInitiator: true layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: true + checkTarget: false + allowedSpecies: [ Moth, Milira ] interactionMessages: - "%user нежно гладит попу %target своим хвостом" - "%user аккуратно проводит своим хвостом по попке %target" diff --git a/Resources/Prototypes/_Lust/Interactions/categories.yml b/Resources/Prototypes/_Lust/Interactions/categories.yml index 8d353abcea8..796c6e4f079 100644 --- a/Resources/Prototypes/_Lust/Interactions/categories.yml +++ b/Resources/Prototypes/_Lust/Interactions/categories.yml @@ -45,11 +45,6 @@ - type: interactionCategory id: Thighs name: lust-interaction-category-Thighs - -- type: interactionCategory - id: Wings - name: lust-interaction-category-Wings - - type: interactionCategory id: Dildos name: lust-interaction-category-Dildos diff --git a/Resources/Prototypes/_Lust/Interactions/cock.yml b/Resources/Prototypes/_Lust/Interactions/cock.yml index c3a72c70c5e..e7375113e17 100644 --- a/Resources/Prototypes/_Lust/Interactions/cock.yml +++ b/Resources/Prototypes/_Lust/Interactions/cock.yml @@ -1,4 +1,4 @@ -- type: interaction +- type: interaction id: CockLegPat name: lust-interaction-CockLegPat icon: CockFootjobIcon @@ -138,6 +138,11 @@ checkTarget: false checkInitiator: true layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: true + checkTarget: false + allowedSpecies: [ Moth, Milira ] interactionMessages: - "%user похотливо обвивает хвостиком член %target" - "%user нежно дрочит хвостиком член %target" diff --git a/Resources/Prototypes/_Lust/Interactions/icons.yml b/Resources/Prototypes/_Lust/Interactions/icons.yml index 156f1766864..20dabbeebc7 100644 --- a/Resources/Prototypes/_Lust/Interactions/icons.yml +++ b/Resources/Prototypes/_Lust/Interactions/icons.yml @@ -337,3 +337,23 @@ id: CockTongueFap name: lust-interaction-icon-CockTongueFap icon: /Textures/_Lust/Interactions/cock_tongue_fap.png + +- type: interactionIcon + id: WingKiss + name: lust-interaction-icon-WingKiss + icon: /Textures/_Lust/Interactions/wing_kiss.png + +- type: interactionIcon + id: WingLick + name: lust-interaction-icon-WingLick + icon: /Textures/_Lust/Interactions/wing_lick.png + +- type: interactionIcon + id: WingStrokeCrotch + name: lust-interaction-icon-WingStrokeCrotch + icon: /Textures/_Lust/Interactions/wing_stroke_crotch.png + +- type: interactionIcon + id: WingsCockFap + name: lust-interaction-icon-WingsCockFap + icon: /Textures/_Lust/Interactions/wings_cock_fap.png diff --git a/Resources/Prototypes/_Lust/Interactions/pussy.yml b/Resources/Prototypes/_Lust/Interactions/pussy.yml index 6dad7e08efc..ced6e5cdae6 100644 --- a/Resources/Prototypes/_Lust/Interactions/pussy.yml +++ b/Resources/Prototypes/_Lust/Interactions/pussy.yml @@ -1,4 +1,4 @@ -- type: interaction +- type: interaction id: PussyTouch name: lust-interaction-PussyTouch icon: PussyTouchIcon @@ -429,6 +429,11 @@ checkTarget: true checkInitiator: false layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: false + checkTarget: true + allowedSpecies: [ Moth, Milira ] interactionMessages: - "%user быстро трахает членом вагину %target, держа за хвост" - "%user жестко трахает членом вагину %target, взяв за хвост" @@ -460,11 +465,15 @@ checkInitiator: false checkTarget: true requiredSex: [ Female, Futanari ] - - !type:BodyAreaTagCondition - checkInitiator: true + - !type:HasVisualLayerCondition checkTarget: false - categories: [ "хвост" ] - requireExposed: true + checkInitiator: true + layer: Tail + - !type:InteractionNotCondition + condition: !type:SpeciesCondition + checkInitiator: true + checkTarget: false + allowedSpecies: [ Moth, Milira ] - !type:BodyAreaTagCondition checkInitiator: false checkTarget: true diff --git a/Resources/Prototypes/_Lust/Interactions/wing_interactions.yml b/Resources/Prototypes/_Lust/Interactions/wing_interactions.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/_Lust/Interactions/wings.yml b/Resources/Prototypes/_Lust/Interactions/wings.yml new file mode 100644 index 00000000000..b1ee7548e27 --- /dev/null +++ b/Resources/Prototypes/_Lust/Interactions/wings.yml @@ -0,0 +1,359 @@ +- type: interaction + id: WingsKiss + name: lust-interaction-WingsKiss + icon: WingKiss + category: Wings + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:BodyAreaTagCondition + checkInitiator: true + checkTarget: false + categories: [ "рот" ] + requireExposed: true + - !type:HasMarkingCondition + checkInitiator: false + checkTarget: true + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user нежно целует крылышки %target" + - "%user ласково целует крылья %target" + - "%user с теплотой прижимается губами к крыльям %target" + interactionSounds: + - Kiss1 + - Kiss2 + - Kiss3 + - Kiss4 + - Kiss5 + - Kiss6 + loveUser: 2 + loveTarget: 4 + cooldown: 3 + +- type: interaction + id: WingsLick + name: lust-interaction-WingsLick + icon: WingLick + category: Wings + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:BodyAreaTagCondition + checkInitiator: true + checkTarget: false + categories: [ "рот" ] + requireExposed: true + - !type:HasMarkingCondition + checkInitiator: false + checkTarget: true + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user нежно облизывает крылышки %target, делая их мокренькими" + - "%user ласково лижет крылья %target" + - "%user проводит языком по крыльям %target, вылизывая их" + interactionSounds: + - FaceLickDoggyStyleSound1 + - FaceLickDoggyStyleSound2 + loveUser: 2 + loveTarget: 4 + cooldown: 3 + +- type: interaction + id: WingsStrokeCrotch + name: lust-interaction-WingsStrokeCrotch + icon: WingStrokeCrotch + category: Wings + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:HasMarkingCondition + checkInitiator: true + checkTarget: false + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user нежно гладит промежность %target своим крылом" + - "%user медленно ласкает промежность %target своим крылом" + - "%user аккуратно проводит крылом по промежности %target" + - "%user игриво поглаживает промежность %target своим крылом" + interactionSounds: + - FriendlyStroke + loveUser: 3 + loveTarget: 6 + cooldown: 3 + +- type: interaction + id: WingsCockFap + name: lust-interaction-WingsCockFap + icon: WingsCockFap + category: Cock + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:SexCondition + checkInitiator: false + checkTarget: true + requiredSex: [ Male, Futanari ] + - !type:BodyAreaTagCondition + checkInitiator: false + checkTarget: true + categories: [ "член" ] + requireExposed: true + - !type:HasMarkingCondition + checkInitiator: true + checkTarget: false + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user похотливо обвивает крылом член %target" + - "%user нежно дрочит крылом член %target" + - "%user ласкает крылом член %target" + - "%user игриво поглаживает крылом член %target" + - "%user сжимает и трахает крылом член %target" + interactionSounds: + - Hlup1 + - Hlup2 + - Hlup3 + - Hlup4 + loveUser: 4 + loveTarget: 7 + cooldown: 3 + +- type: interaction + id: WingsPussyFuck + name: lust-interaction-WingsPussyFuck + icon: WingScratch + category: Pussy + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:SexCondition + checkInitiator: true + checkTarget: false + requiredSex: [ Male, Futanari ] + - !type:SexCondition + checkInitiator: false + checkTarget: true + requiredSex: [ Female, Futanari ] + - !type:BodyAreaTagCondition + checkInitiator: true + checkTarget: false + categories: [ "член" ] + requireExposed: true + - !type:BodyAreaTagCondition + checkInitiator: false + checkTarget: true + categories: [ "вагина" ] + requireExposed: true + - !type:HasMarkingCondition + checkInitiator: false + checkTarget: true + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user ритмично трахает вагину %target, сжимая её крылья" + - "%user крепко держит крылья %target, и жестко трахает её вагину" + - "%user стиснув крылья %target, страстно долбит её вагину своим членом" + - "%user сжимая крылья %target, натягивает их на себя и трахает её вагину" + - "%user на всю длину входит членом в вагину %target, прижимая её за крылья" + interactionSounds: + - Hlup1 + - Hlup2 + - Hlup3 + - Hlup4 + loveUser: 10 + loveTarget: 10 + cooldown: 3 + +- type: interaction + id: WingsAssFuck + name: lust-interaction-WingsAssFuck + icon: WingScratch + category: Anal + appearConditions: + - !type:HasTargetCondition + allowSelfTargeting: false + - !type:SexCondition + checkInitiator: true + checkTarget: false + requiredSex: [ Male, Futanari ] + - !type:BodyAreaTagCondition + checkInitiator: true + checkTarget: false + categories: [ "член" ] + requireExposed: true + - !type:BodyAreaTagCondition + checkInitiator: false + checkTarget: true + categories: [ "анал" ] + requireExposed: true + - !type:HasMarkingCondition + checkInitiator: false + checkTarget: true + markingWhitelist: + - MiliraWingBasic + - MiliraWingBasicOpen + - MiliraWingBasicFlight + - MothWingsDefault + - MothWingsCharred + - MothWingsDbushy + - MothWingsDeathhead + - MothWingsFan + - MothWingsDfan + - MothWingsFeathery + - MothWingsFirewatch + - MothWingsGothic + - MothWingsJungle + - MothWingsLadybug + - MothWingsMaple + - MothWingsMoffra + - MothWingsOakworm + - MothWingsPlasmafire + - MothWingsPointy + - MothWingsRoyal + - MothWingsStellar + - MothWingsStriped + - MothWingsSwirly + - MothWingsWhitefly + - MothWingsWitchwing + - MothWingsUnderwing + interactionMessages: + - "%user ритмично трахает анус %target, сжимая крылья" + - "%user крепко держит крылья %target, и жестко трахает анус" + - "%user стиснув крылья %target, страстно долбит анус своим членом" + - "%user на всю длину входит членом в анус %target, прижимая крылья" + interactionSounds: + - Hlup1 + - Hlup2 + - Hlup3 + - Hlup4 + loveUser: 10 + loveTarget: 10 + cooldown: 3 diff --git a/Resources/Textures/_Lust/Interactions/wing_kiss.png b/Resources/Textures/_Lust/Interactions/wing_kiss.png new file mode 100644 index 00000000000..4f378e121ce Binary files /dev/null and b/Resources/Textures/_Lust/Interactions/wing_kiss.png differ diff --git a/Resources/Textures/_Lust/Interactions/wing_lick.png b/Resources/Textures/_Lust/Interactions/wing_lick.png new file mode 100644 index 00000000000..6b6208e8250 Binary files /dev/null and b/Resources/Textures/_Lust/Interactions/wing_lick.png differ diff --git a/Resources/Textures/_Lust/Interactions/wing_stroke_crotch.png b/Resources/Textures/_Lust/Interactions/wing_stroke_crotch.png new file mode 100644 index 00000000000..6b60952aff4 Binary files /dev/null and b/Resources/Textures/_Lust/Interactions/wing_stroke_crotch.png differ diff --git a/Resources/Textures/_Lust/Interactions/wings_cock_fap.png b/Resources/Textures/_Lust/Interactions/wings_cock_fap.png new file mode 100644 index 00000000000..3e24d32fe60 Binary files /dev/null and b/Resources/Textures/_Lust/Interactions/wings_cock_fap.png differ