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

Фиксы связанные с новым полом #176

Merged
merged 2 commits into from
Feb 15, 2025
Merged

Фиксы связанные с новым полом #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e1bb9
add pussy and fix markings
kanopus952 Feb 14, 2025
4560e17
forgot about some sprites
kanopus952 Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Content.Client/Humanoid/HumanoidAppearanceSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,13 @@ private void SetLayerData(
if (sexMorph)
protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);

var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
component.BaseLayers[key] = proto;
// Lust-start
if (_prototypeManager.TryIndex(protoId, out HumanoidSpeciesSpriteLayer? proto))
component.BaseLayers[key] = proto;

if (proto == null)
return;
// Lust-end
if (proto.MatchSkin)
layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);

Expand Down
2 changes: 2 additions & 0 deletions Content.Client/_Sunrise/ERP/InteractionWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ public void Populate()
if (UserSex == Sex.Male) UserDescription.AddChild(new Label { Text = "...Обладаете пенисом" });
if (UserSex == Sex.Female) UserDescription.AddChild(new Label { Text = "...Обладаете вагиной" });
if (UserSex == Sex.Female) UserDescription.AddChild(new Label { Text = "...Обладаете грудью" });
if (UserSex == Sex.Futanari) UserDescription.AddChild(new Label { Text = "...Обладаете вагиной" });
if (UserSex == Sex.Futanari) UserDescription.AddChild(new Label { Text = "...Обладаете грудью" });
if (UserSex == Sex.Futanari) UserDescription.AddChild(new Label { Text = "...Обладаете пенисом" });
//Таргет
Expand All @@ -321,6 +322,7 @@ public void Populate()
TargetDescription.AddChild(new Label { Text = "...Обладает анусом" });
if (TargetSex == Sex.Male) TargetDescription.AddChild(new Label { Text = "...Обладает пенисом" });
if (TargetSex == Sex.Futanari) TargetDescription.AddChild(new Label { Text = "...Обладаете пенисом" });
if (TargetSex == Sex.Futanari) TargetDescription.AddChild(new Label { Text = "...Обладаете вагиной" });
if (TargetSex == Sex.Female) TargetDescription.AddChild(new Label { Text = "...Обладает вагиной" });
}
if (TargetSex == Sex.Female) TargetDescription.AddChild(new Label { Text = "...Обладает грудью" });
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_Lust/ERP/Interactions/cock_interactions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Male
- Futanari
Expand Down Expand Up @@ -345,6 +346,7 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Male
- Futanari
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Lust/ERP/Interactions/horn_interactions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Male
erp: true
Expand Down Expand Up @@ -183,8 +184,10 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 9
lovePercentTarget: 5
Expand Down Expand Up @@ -231,6 +234,7 @@
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 10
lovePercentTarget: 10
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/_Lust/ERP/Interactions/pussy_interactions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 4
lovePercentTarget: 8
Expand Down Expand Up @@ -54,6 +55,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 4
lovePercentTarget: 9
Expand Down Expand Up @@ -82,6 +84,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 4
lovePercentTarget: 9
Expand All @@ -107,8 +110,10 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 9
lovePercentTarget: 9
Expand Down Expand Up @@ -146,6 +151,7 @@
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 10
lovePercentTarget: 10
Expand Down Expand Up @@ -181,6 +187,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
useSelf: true
lovePercentTarget: 8
Expand Down Expand Up @@ -209,6 +216,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
useSelf: true
lovePercentUser: 4
Expand Down Expand Up @@ -237,6 +245,7 @@
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 8
lovePercentTarget: 8
Expand All @@ -263,6 +272,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 3
lovePercentTarget: 7
Expand All @@ -289,6 +299,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 3
lovePercentTarget: 9
Expand Down Expand Up @@ -319,6 +330,7 @@
- Futanari
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 10
lovePercentTarget: 10
Expand Down Expand Up @@ -348,6 +360,7 @@
- Unsexed
targetSex:
- Female
- Futanari
erp: true
lovePercentUser: 10
lovePercentTarget: 10
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_Lust/ERP/Interactions/toyInteractions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
- Unsexed
targetSex:
- Female
- Futanari
targetTagBlacklist:
- pants
- jumpsuit
Expand Down Expand Up @@ -214,6 +215,7 @@
- path: /Audio/_Lust/ERP/hlup4.ogg
userSex:
- Female
- Futanari
targetSex:
- Unsexed
targetTagBlacklist:
Expand Down
72 changes: 72 additions & 0 deletions Resources/Prototypes/_Lust/Futanari/futanari.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,75 @@
baseSprite:
sprite: _Lust/Mobs/Species/Human/parts.rsi
state: torso_fut

- type: humanoidBaseSprite
id: MobDemonHeadFutanari
baseSprite:
sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
state: head_f

- type: humanoidBaseSprite
id: MobDemonTorsoFutanari
baseSprite:
sprite: _Lust/Mobs/Species/Demon/parts.rsi
state: torso_fut

- type: humanoidBaseSprite
id: MobTajaranHeadFutanari
baseSprite:
sprite: _Sunrise/Mobs/Species/Tajaran/parts.rsi
state: head_f


- type: humanoidBaseSprite
id: MobTajaranTorsoFutanari
baseSprite:
sprite: _Lust/Mobs/Species/Tajaran/parts.rsi
state: torso_fut

- type: humanoidBaseSprite
id: MobVulpkaninHeadFutanari
baseSprite:
sprite: _Sunrise/Mobs/Species/Vulpkanin/parts.rsi
state: head_f

- type: humanoidBaseSprite
id: MobVulpkaninTorsoFutanari
baseSprite:
sprite: _Sunrise/Mobs/Species/Vulpkanin/parts.rsi
state: torso_f

- type: humanoidBaseSprite
id: MobMothHeadFutanari
baseSprite:
sprite: Mobs/Species/Moth/parts.rsi
state: head_f

- type: humanoidBaseSprite
id: MobMothTorsoFutanari
baseSprite:
sprite: Mobs/Species/Moth/parts.rsi
state: torso_f

- type: humanoidBaseSprite
id: MobReptilianHeadFutanari
baseSprite:
sprite: Mobs/Species/Reptilian/parts.rsi
state: head_f

- type: humanoidBaseSprite
id: MobReptilianTorsoFutanari
baseSprite:
sprite: Mobs/Species/Reptilian/parts.rsi
state: torso_f
- type: humanoidBaseSprite
id: MobSlimeHeadFutanari
baseSprite:
sprite: Mobs/Species/Slime/parts.rsi
state: head_f

- type: humanoidBaseSprite
id: MobSlimeTorsoFutanari
baseSprite:
sprite: Mobs/Species/Slime/parts.rsi
state: torso_f
15 changes: 15 additions & 0 deletions Resources/Textures/_Lust/Mobs/Species/Demon/parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "torso_fut",
"directions": 4
}
]
}
Binary file added Resources/Textures/_Lust/Mobs/Species/Demon/parts.rsi/torso_fut.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Resources/Textures/_Lust/Mobs/Species/Tajaran/parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "torso_fut",
"directions": 4
}
]
}
Binary file added Resources/Textures/_Lust/Mobs/Species/Tajaran/parts.rsi/torso_fut.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading