Skip to content

Coyote genital markings V1 #267

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

Open
JFerrix wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Coyote genital markings V1 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4cea804
Added markings. Still dont work
JFerrix Mar 6, 2026
8fb589a
got it to work
JFerrix Mar 6, 2026
b1c060a
did things
JFerrix Mar 6, 2026
ffb7aab
Try to add consent thing but this system is weird
JFerrix Mar 8, 2026
8bb7a87
re-sorted things and cleaned up
JFerrix Mar 9, 2026
fc65b73
Added technical implementations for genitals
JFerrix Mar 12, 2026
3db1fff
Create genitals.ftl
JFerrix Mar 12, 2026
7582125
undoing a whoops moment
JFerrix Mar 15, 2026
e0b426e
Added license information
JFerrix Mar 16, 2026
8d1e645
bruh
JFerrix Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Content.Server/_Floof/Humanoid/ModifyUndies/ModifyUndiesComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public sealed partial class ModifyUndiesComponent : Component
public List<HumanoidVisualLayers> BodyPartTargets =
[
HumanoidVisualLayers.UndergarmentBottom,
HumanoidVisualLayers.UndergarmentTop
HumanoidVisualLayers.UndergarmentTop,
HumanoidVisualLayers.Genital
];
}

Expand Down
1 change: 1 addition & 0 deletions Content.Server/_Floof/Humanoid/ModifyUndies/ModifyUndiesSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ private void AddModifyUndiesVerb(EntityUid uid, ModifyUndiesComponent component,
{
HumanoidVisualLayers.UndergarmentTop => new(new("/Textures/_Floof/Interface/VerbIcons/bra.png")),
HumanoidVisualLayers.UndergarmentBottom => new(new("/Textures/_Floof/Interface/VerbIcons/underpants.png")),
HumanoidVisualLayers.Genital => new(new("/Textures/_Floof/Interface/VerbIcons/bra.png")),
_ => new SpriteSpecifier.Texture(new("/Textures/_Floof/Interface/VerbIcons/undies.png"))
};
// add the verb
Expand Down
1 change: 1 addition & 0 deletions Content.Shared/Humanoid/HumanoidVisualLayers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public enum HumanoidVisualLayers : byte
Tail,
Hair,
FacialHair,
Genital, // Floof: Attempting to port coyotes marking system. its not going well
UndergarmentTop, // Floofstation note: Undershirt has been changed to this
UndergarmentBottom, // Floofstation note: Underwear has been changed to this
Chest,
Expand Down
2 changes: 2 additions & 0 deletions Content.Shared/Humanoid/Markings/MarkingCategories.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Content.Shared.Humanoid.Markings
[Serializable, NetSerializable]
public enum MarkingCategories : byte
{
Genital,
TaurBody,
TaurBodyConnector,
Special,
Expand Down Expand Up @@ -68,6 +69,7 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
HumanoidVisualLayers.Tail => MarkingCategories.Tail,
HumanoidVisualLayers.RArmExtension => MarkingCategories.Arms, // Frontier: species-specific layer
HumanoidVisualLayers.LArmExtension => MarkingCategories.Arms, // Frontier: species-specific layer
HumanoidVisualLayers.Genital => MarkingCategories.Genital,
HumanoidVisualLayers.TaurBodyConnector => MarkingCategories.TaurBodyConnector, // Floof: species-specific layer
HumanoidVisualLayers.TaurBody => MarkingCategories.TaurBody, // Floof: species-specific layer
_ => MarkingCategories.Overlay
Expand Down
1,400 changes: 1,400 additions & 0 deletions Resources/Locale/en-US/_CTE/genitals.ftl
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
- map: ["enum.HumanoidVisualLayers.LHand"]
- map: ["enum.HumanoidVisualLayers.RHand"]
- map: [ "enum.HumanoidVisualLayers.Genital" ] # Floofstation
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: ["jumpsuit"]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "belt" ]
Expand Down
16 changes: 9 additions & 7 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
- map: ["enum.HumanoidVisualLayers.LHand"]
- map: ["enum.HumanoidVisualLayers.RHand"]
- map: [ "enum.HumanoidVisualLayers.Genital" ] # Floofstation
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: ["jumpsuit"]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
Expand Down Expand Up @@ -340,13 +341,14 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: ["enum.HumanoidVisualLayers.LFoot"] # Floof, why was this between jumpsuit and handcuffs to begin with?
- map: ["enum.HumanoidVisualLayers.RFoot"] # Floof
- map: ["enum.HumanoidVisualLayers.LHand"] # Floof
- map: ["enum.HumanoidVisualLayers.RHand"] # Floof
- map: [ "enum.HumanoidVisualLayers.Genital" ] # Floofstation
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
- map: ["enum.HumanoidVisualLayers.LHand"]
- map: ["enum.HumanoidVisualLayers.RHand"]
- map: ["enum.HumanoidVisualLayers.Handcuffs"]
color: "#ffffff"
sprite: Objects/Misc/handcuffs.rsi
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/moth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,14 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: [ "jumpsuit" ]
- map: [ "enum.HumanoidVisualLayers.LHand" ]
- map: [ "enum.HumanoidVisualLayers.RHand" ]
- map: [ "enum.HumanoidVisualLayers.LFoot" ]
- map: [ "enum.HumanoidVisualLayers.RFoot" ]
- map: [ "enum.HumanoidVisualLayers.Genital" ] # Floofstation
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: [ "jumpsuit" ]
- map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
color: "#ffffff"
sprite: Objects/Misc/handcuffs.rsi
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/vox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,14 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: [ "jumpsuit" ]
- map: [ "enum.HumanoidVisualLayers.LFoot" ]
- map: [ "enum.HumanoidVisualLayers.RFoot" ]
- map: [ "enum.HumanoidVisualLayers.LHand" ]
- map: [ "enum.HumanoidVisualLayers.RHand" ]
- map: [ "enum.HumanoidVisualLayers.Genital" ] # Floofstation
- map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
- map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
- map: [ "jumpsuit" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Species/arachnid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
RLeg: MobArachnidRLeg
LFoot: MobArachnidLFoot
RFoot: MobArachnidRFoot
Genital: MobHumanoidAnyMarking

- type: humanoidBaseSprite
id: MobArachnidEyes
Expand Down Expand Up @@ -106,6 +107,9 @@
Arms:
points: 10
required: false
Genital:
points: 10
required: false

- type: humanoidBaseSprite
id: MobArachnidHead
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Species/moth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
RLeg: MobMothRLeg
LFoot: MobMothLFoot
RFoot: MobMothRFoot
Genital: MobHumanoidAnyMarking

- type: humanoidBaseSprite
id: MobMothEyes
Expand Down Expand Up @@ -101,6 +102,9 @@
Arms:
points: 10
required: false
Genital:
points: 10
required: false

- type: humanoidBaseSprite
id: MobMothHead
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Species/vox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
RLeg: MobVoxRLeg
LFoot: MobVoxLFoot
RFoot: MobVoxRFoot
Genital: MobHumanoidAnyMarking

- type: markingPoints
id: MobVoxMarkingLimits
Expand Down Expand Up @@ -101,6 +102,9 @@
points: 10
required: true
defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ]
Genital:
points: 10
required: false

- type: humanoidBaseSprite
id: MobVoxEyes
Expand Down
Loading
Loading