Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- tweak: Youbka update (#75)

Browse Source 
* - fix: animation log shit

* - tweak: skirt funny think
This commit is contained in:
Cinkafox
2024-03-11 21:00:33 +03:00
committed by GitHub
parent d0174cf8da
commit fdee5c808a
11 changed files with 74 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/_Amour/Animation/SharebleAnimationSystem.cs
View File

@@ -28,12 +28,14 @@ public sealed class SharebleAnimationSystem : SharedAnimationSystem
private void OnProtoStart(AnimationProtoStartMessage ev)
{
Play(GetEntity(ev.Owner),ev.ProtoId);
if(ev.Owner.Valid)
Play(GetEntity(ev.Owner),ev.ProtoId);
}
private void OnStart(AnimationStartMessage ev)
{
Play(GetEntity(ev.Owner),ev.Data,ev.Id);
if(ev.Owner.Valid)
Play(GetEntity(ev.Owner),ev.Data,ev.Id);
}
public override void Play(EntityUid uid,ProtoId<AnimationPrototype> protoId)

1
Content.Shared/_Amour/Hole/HoleComponent.cs
View File

@@ -28,6 +28,7 @@ public sealed partial class HoleComponent : Component
[ViewVariables(VVAccess.ReadWrite)] public bool IsExcited = false;
[DataField] public bool IsMainHole = false;
[DataField] public bool IsVisibleInSkirt = true;
}
[Serializable, NetSerializable, DataDefinition]

2
Content.Shared/_Amour/Hole/HoleSystem.Access.cs
View File

@@ -22,7 +22,7 @@ public partial class SharedHoleSystem
foreach (var slot in hole.Comp.HoleNotVisibleIn)
{
if (_inventory.TryGetSlotEntity(entity, slot, out _, entity))
if (_inventory.TryGetSlotEntity(entity, slot, out var item, entity) && !(HasComp<VisibleHoleComponent>(item) && hole.Comp.IsVisibleInSkirt))
return false;
}

7
Content.Shared/_Amour/Hole/VisibleHoleComponent.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Content.Shared._Amour.Hole;
[RegisterComponent]
public sealed partial class VisibleHoleComponent : Component
{
}

1
Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
View File

@@ -72,3 +72,4 @@
- type: Clothing
slots: [innerclothing]
femaleMask: UniformTop
- type: VisibleHole # AMOUR EDIT

1
Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
View File

@@ -31,4 +31,5 @@
- VendingMachineSoda
- VendingMachineStarkist
- VendingMachineSpaceUp
- VendingMachineKink # AMOUR
chance: 1

18
Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
View File

@@ -68,14 +68,28 @@
proto: spider
- type: Sprite # I'd prefer if these maps were better. Insert map pun here.
layers:
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtBehind" ]
- map: [ "enum.GenitalVisualLayers.BreastBehind" ]
- map: [ "enum.GenitalVisualLayers.VaginaBehind" ]
- map: [ "enum.GenitalVisualLayers.TesticlesBehind" ]
- map: [ "enum.GenitalVisualLayers.DickBehind" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.Chest" ]
- map: [ "enum.HumanoidVisualLayers.Head" ]
- map: [ "enum.HumanoidVisualLayers.Snout" ]
- map: [ "enum.HumanoidVisualLayers.Eyes" ]
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ] #Amour
- map: [ "underwearb" ] #White
- map: [ "underweart" ] #White
- shader: StencilClear

36
Resources/Prototypes/Entities/Mobs/Species/base.yml
View File

@@ -20,10 +20,17 @@
- map: [ "enum.HumanoidVisualLayers.Head" ]
- map: [ "enum.HumanoidVisualLayers.Snout" ]
- map: [ "enum.HumanoidVisualLayers.Eyes" ]
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ] #Amour
- shader: StencilClear
sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
# its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
@@ -51,13 +58,6 @@
- map: [ "id" ]
- map: [ "neck" ]
- map: [ "back" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
- map: [ "enum.HumanoidVisualLayers.Hair" ]
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]
@@ -383,10 +383,17 @@
- map: [ "enum.HumanoidVisualLayers.Head" ]
- map: [ "enum.HumanoidVisualLayers.Snout" ]
- map: [ "enum.HumanoidVisualLayers.Eyes" ]
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ] #Amour
- shader: StencilClear
sprite: Mobs/Species/Human/parts.rsi
state: l_leg
@@ -417,13 +424,6 @@
- map: [ "id" ]
- map: [ "neck" ]
- map: [ "back" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
- map: [ "enum.HumanoidVisualLayers.Hair" ]
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]

18
Resources/Prototypes/Entities/Mobs/Species/moth.yml
View File

@@ -77,10 +77,17 @@
- map: [ "enum.HumanoidVisualLayers.Head" ]
- map: [ "enum.HumanoidVisualLayers.Snout" ]
- map: [ "enum.HumanoidVisualLayers.Eyes" ]
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.RArm" ]
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ] # AMOUR
- map: [ "underwearb" ] #White
- map: [ "underweart" ] #White
- shader: StencilClear
@@ -126,13 +133,6 @@
sprite: "Effects/creampie.rsi"
state: "creampie_moth"
visible: false
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- type: CustomHeight
- type: entity

30
Resources/Prototypes/White/Mobs/Species/felinid.yml
View File

@@ -178,14 +178,6 @@
color: "#008800"
sprite: Mobs/Customization/eyes.rsi
state: eyes
- map: ["enum.HumanoidVisualLayers.RArm"]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: r_arm
- map: ["enum.HumanoidVisualLayers.LArm"]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: l_arm
- map: ["enum.HumanoidVisualLayers.RLeg"]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
@@ -194,6 +186,21 @@
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: l_leg
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: [ "enum.HumanoidVisualLayers.RArm" ]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: r_arm
- map: [ "enum.HumanoidVisualLayers.LArm" ]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: l_arm
- map: [ "enum.GenitalVisualLayers.BreastFront" ] # AMOUR
- shader: StencilClear
- shader: StencilMask
@@ -236,13 +243,6 @@
- map: ["belt"]
- map: ["neck"]
- map: ["back"]
# START AMOUR EDIT
- map: [ "enum.GenitalVisualLayers.ButtFront" ]
- map: [ "enum.GenitalVisualLayers.BreastFront" ]
- map: [ "enum.GenitalVisualLayers.VaginaFront" ]
- map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
- map: [ "enum.GenitalVisualLayers.DickFront" ]
# END AMOUR EDIT
- map: ["enum.HumanoidVisualLayers.FacialHair"]
state: shaved
sprite: Mobs/Customization/human_facial_hair.rsi

1
Resources/Prototypes/_Amour/Entities/Holes/base.yml
View File

@@ -87,6 +87,7 @@
- layer: "enum.GenitalVisualLayers.BreastFront"
prefix: "_0_FRONT"
excitedPrefix: "_1_FRONT"
isVisibleInSkirt: false
- type: HoleSolution
- type: HoleInventory