Skip to content

Приведение маркеров комментариев Lust к единому формату #502

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
Soragy-bot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Приведение маркеров комментариев Lust к единому формату #502

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
02e90b0
chore: normalize Lust comment markers to consistent format
Soragy-bot Mar 18, 2026
7fd1451
chore: normalize Lust comment markers to consistent format 2
Soragy-bot Mar 18, 2026
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
4 changes: 2 additions & 2 deletions Content.Client/Clothing/ClientClothingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
}

break;
// Lust-start
// Lust-Start
case Sex.Futanari:

displacementData = inventory.FemaleDisplacements.GetValueOrDefault($"{slot}-{bodyTypeName}")
Expand All @@ -345,7 +345,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
}

break;
// Lust-end
// Lust-End
}
}

Expand Down
4 changes: 2 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 @@ -125,13 +125,13 @@ private void SetLayerData(
if (sexMorph)
protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);

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

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

Expand Down
6 changes: 3 additions & 3 deletions Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,11 +1366,11 @@ private void SetSex(Sex newSex)
case Sex.Female:
Profile = Profile?.WithGender(Gender.Female);
break;
// Lust-start
// Lust-Start
case Sex.Futanari:
Profile = Profile?.WithGender(Gender.Female);
break;
// Lust-end
// Lust-End
Comment on lines +1369 to +1373
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# 1) Ищем потенциальные зависимости от старого формата вне прототипов.
rg -n -e 'LUST STATION|Lust Edit|#Lust Edit|Lust-start|Lust-end' -g '!Resources/Prototypes/**' .

# 2) Проверяем, что новый формат действительно используется в прототипах.
rg -n -e '# Lust-(Start|End|Edit)\b' Resources/Prototypes

Repository: space-sunrise/lust-station

Length of output: 50382

Несогласованность форматов маркеров Lust в кодовой базе.

В коде используются блочные комментарии // Lust-Start и // Lust-End, но в проекте одновременно присутствуют другие форматы: // Sunrise-Lust Edit в C# и # Lust-Edit / # Lust-Start в YAML. Это создаёт риск для служебных скриптов, которые ищут fork-специфичные изменения — они могут не распознать все вариации маркеров.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs` around lines 1369 -
1373, The Lust markers in the Sex.Futanari switch block (the case containing
Profile = Profile?.WithGender(Gender.Female);) use nonstandard comments "//
Lust-Start" and "// Lust-End"; replace these with the project's canonical C#
marker format (use "// Sunrise-Lust Edit" or the agreed single-line marker pair
used elsewhere) so the start and end of this forked block match other C# edits
and service scripts can detect them reliably; ensure both the opening and
closing markers are updated together and preserve the exact placement around the
case block.

default:
Profile = Profile?.WithGender(Gender.Epicene);
break;
Expand Down Expand Up @@ -1586,7 +1586,7 @@ private void UpdateSexControls()
else
{
SexButton.SelectId((int) sexes[0]);
SetSex(sexes[0]); // Lust-edit
SetSex(sexes[0]); // Lust-Edit
}
}

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Stylesheets/StyleNano.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
itemListBackgroundSelected)
}),

//sunrise-lust-edit-start
// Lust-Start
new StyleRule(new SelectorElement(typeof(ItemList), new[] {"darkItemList"}, null, null), new[]
{
new StyleProperty(ItemList.StylePropertyBackground,
Expand All @@ -1068,7 +1068,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
new StyleProperty(ItemList.StylePropertySelectedItemBackground,
itemListBackgroundSelected)
}),
//sunrise-lust-edit-end
// Lust-End
new StyleRule(new SelectorElement(typeof(ItemList), new[] {"transparentItemList"}, null, null), new[]
{
new StyleProperty(ItemList.StylePropertyBackground,
Expand Down
6 changes: 3 additions & 3 deletions Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,20 +633,20 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
};
args.Verbs.Add(nyanify);

var killSignName = Loc.GetString("admin-smite-fuck-sign-name").ToLowerInvariant(); // Lust-edit
var killSignName = Loc.GetString("admin-smite-fuck-sign-name").ToLowerInvariant(); // Lust-Edit
Verb killSign = new()
{
Text = killSignName,
Category = VerbCategory.Smite,
Icon = new SpriteSpecifier.Rsi(new("_Lust/Objects/Misc/fuck_sign.rsi"), "icon"), // Lust-edit
Icon = new SpriteSpecifier.Rsi(new("_Lust/Objects/Misc/fuck_sign.rsi"), "icon"), // Lust-Edit
Act = () =>
{
EnsureComp<KillSignComponent>(args.Target, out var comp);
comp.HideFromOwner = false; // We set it to false anyway, in case the hidden smite was used beforehand.
Dirty(args.Target, comp);
},
Impact = LogImpact.Extreme,
Message = string.Join(": ", killSignName, Loc.GetString("admin-smite-fuck-sign-description")) // Lust-edit
Message = string.Join(": ", killSignName, Loc.GetString("admin-smite-fuck-sign-description")) // Lust-Edit
};
args.Verbs.Add(killSign);

Expand Down
12 changes: 6 additions & 6 deletions Content.Server/Database/ServerDbBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)

var spawnPriority = (SpawnPriorityPreference) profile.SpawnPriority;

// Sunrise-Lust Start
// Lust-Start
var erp = Erp.Ask;
var virginity = Virginity.No;
var analVirginity = Virginity.Yes;
Expand All @@ -238,7 +238,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
var gender = sex == Sex.Male ? Gender.Male : Gender.Female;
if (Enum.TryParse<Gender>(profile.Gender, true, out var genderVal))
gender = genderVal;
// Sunrise-Lust End
// Lust-End

// Sunrise-TTS-Start
var voice = profile.Voice;
Expand Down Expand Up @@ -294,9 +294,9 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
profile.BodyType,
profile.Age,
sex,
erp, // Sunrise-Lust Edit
virginity, // Sunrise-Lust Edit
analVirginity, // Sunrise-Lust Edit
erp, // Lust-Edit
virginity, // Lust-Edit
analVirginity, // Lust-Edit
gender,
new HumanoidCharacterAppearance
(
Expand Down Expand Up @@ -349,7 +349,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
profile.Sex = humanoid.Sex.ToString();
profile.Gender = humanoid.Gender.ToString();

// Sunrise-Lust Edit - Update or create ErpData
// Lust-Edit - Update or create ErpData
if (profile.ErpData == null)
{
profile.ErpData = new ProfileErp
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Speech/EntitySystems/StutteringSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ public override void DoRemoveStutter(EntityUid uid)

private void OnAccent(Entity<StutteringAccentComponent> entity, ref AccentGetEvent args)
{
// Lust-start
// Lust-Start
if (TryComp<VibratingComponent>(entity, out var pu))
{
entity.Comp.MatchRandomProb = 0.3f;
entity.Comp.FourRandomProb = 0;
entity.Comp.ThreeRandomProb = 0;
entity.Comp.CutRandomProb = 0;
}
// Lust-end
// Lust-End
args.Message = Accentuate(args.Message, entity.Comp);
}

Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,10 @@ private Dictionary<NetUserId, List<string>> GetPlayersJobCandidates(int? weight,
continue;
// Sunrise-End

// Sunrise-Lust start
// Lust-Start
if (job.SexBlacklist.Contains(profile.Sex))
continue;
// Sunrise-Lust end
// Lust-End

availableJobs ??= new List<string>(profile.JobPriorities.Count);
availableJobs.Add(jobId);
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/_Sunrise/Fugitive/FugitiveSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private FormattedMessage GenerateFugiReport(EntityUid uid)
{
Sex.Male => Loc.GetString("fugitive-report-sex-m"),
Sex.Female => Loc.GetString("fugitive-report-sex-f"),
Sex.Futanari => Loc.GetString("fugitive-report-sex-f"), // Lust-edit
Sex.Futanari => Loc.GetString("fugitive-report-sex-f"), // Lust-Edit
_ => Loc.GetString("fugitive-report-sex-n")
};

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Humanoid/Sex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public enum Sex : byte
Male,
Female,
Unsexed,
Futanari, // Lust-edit
Futanari, // Lust-Edit
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
{
{Sex.Male, "Voljin"},
{Sex.Female, "Amina"},
{Sex.Futanari, "Amina"}, // Lust-edit
{Sex.Futanari, "Amina"}, // Lust-Edit
{Sex.Unsexed, "Charlotte"}
};
// Sunrise-TTS-End
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Inventory/InventoryComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public ProtoId<InventoryTemplatePrototype> TemplateIdVV
[DataField, AutoNetworkedField]
public Dictionary<string, DisplacementData> MaleDisplacements = new();

// Lust-start
// Lust-Start
[DataField]
public Dictionary<string, DisplacementData> FutanariDisplacements = new();
// Lust-end
// Lust-End
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Roles/JobPrototype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ public sealed partial class JobPrototype : IPrototype
public SpriteSpecifier PreviewIcon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_Sunrise/Interface/Misc/job_preview.rsi"), "test");
// Sunrise-End

// Sunrise-Lust start
// Lust-Start
[DataField("sexBlacklist")]
public List<Sex> SexBlacklist = new();
// Sunrise-Lust end
// Lust-End
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public sealed partial class EmagSiliconLawComponent : Component
/// to let them know they've been emagged
/// </summary>
[DataField]
public SoundSpecifier EmaggedSound = new SoundPathSpecifier("/Audio/_Lust/Ambience/Antag/death_to_qillu_corporation.ogg"); //Lust-edit
public SoundSpecifier EmaggedSound = new SoundPathSpecifier("/Audio/_Lust/Ambience/Antag/death_to_qillu_corporation.ogg"); // Lust-Edit

}
4 changes: 2 additions & 2 deletions Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public sealed partial class ShockOnTriggerComponent : BaseXOnTriggerComponent
[DataField, AutoNetworkedField]
public TimeSpan Duration = TimeSpan.FromSeconds(2);

// Lust-start
// Lust-Start
/// <summary>
/// Как часто можно шокировать цель.
/// </summary>
Expand All @@ -44,5 +44,5 @@ public sealed partial class ShockOnTriggerComponent : BaseXOnTriggerComponent
/// </summary>
[DataField(readOnly: true), AutoNetworkedField]
public TimeSpan PreviousActivation = TimeSpan.Zero;
// Lust-end
// Lust-End
}
4 changes: 2 additions & 2 deletions Resources/Prototypes/Body/Parts/silicon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
abstract: true
components:
- type: Sprite
sprite: _Lust/Objects/Specific/Robotics/cyborg_parts.rsi # Lust edit
sprite: _Lust/Objects/Specific/Robotics/cyborg_parts.rsi # Lust-Edit
- type: Icon
sprite: _Lust/Objects/Specific/Robotics/cyborg_parts.rsi # Lust edit
sprite: _Lust/Objects/Specific/Robotics/cyborg_parts.rsi # Lust-Edit
- type: Damageable
damageContainer: Inorganic
- type: BodyPart
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2
CopyMachineFlatpack: 2
LibrarianPointer: 2 # Lust-add
LibrarianPointer: 2 # Lust-Edit
contrabandInventory:
ToyFigurineLibrarian: 1

4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
ClothingHeadHatSurgcapBlue: 4
ClothingHeadHatSurgcapPurple: 4
ClothingShoesBootsWinterMed: 2
#Lust-start
# Lust-Start
ClothingOuterCoatMedNeko: 2
ClothingOuterCoatMedNekoBlue: 2
ClothingOuterCoatMedNekoGreen: 2
ClothingOuterCoatMedNekoPurple: 2
#Lust-end
# Lust-End
contrabandInventory:
ClothingUniformJumpskirtOfLife: 1
ToyFigurineMedicalDoctor: 1
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
#Lust-start
# Lust-Start
ClothingBeerCostume: 2
ClothingPivozavr: 2
#Lust-end
# Lust-End
contrabandInventory:
ClothingHeadHatRichard: 1
ToyFigurineBoxer: 1
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
- SimpleHostile
- type: Sprite
drawdepth: SmallMobs
sprite: _Lust/Mobs/Animals/regal_rat.rsi # Lust - edit
sprite: _Lust/Mobs/Animals/regal_rat.rsi # Lust-Edit
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: regalrat
Expand Down Expand Up @@ -142,10 +142,10 @@
- type: VentCrawler
- type: NightVision
# Sunrise-end
# Sunrise-Lust start
# Lust-Start
- type: TTS
voice: Planya
# Sunrise-Lust end
# Lust-End

- type: entity
id: MobRatKingBuff
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Player/clone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
components:
# general
- DetailExaminable
- ErpStatus # Lust-Station
- ErpStatus # Lust-Edit
- Dna
- Fingerprint
- NpcFactionMember
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
Male: UnisexDwarf
Female: FemaleDwarf
Unsexed: UnisexDwarf
Futanari: FemaleDwarf # Lust-edit
Futanari: FemaleDwarf # Lust-Edit
- type: ReplacementAccent
accent: dwarf
- type: Speech
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/moth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
Male: UnisexMoth
Female: UnisexMoth
Unsexed: UnisexMoth
Futanari: UnisexMoth # Lust-edit
Futanari: UnisexMoth # Lust-Edit
- type: MovementSpeedModifier
baseWeightlessAcceleration: 1.5 # Move around more easily in space.
baseWeightlessFriction: 1
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Male: MaleReptilian
Female: FemaleReptilian
Unsexed: MaleReptilian
Futanari: FemaleReptilian # Lust-edit
Futanari: FemaleReptilian # Lust-Edit
- type: BodyEmotes
soundsId: ReptilianBodyEmotes
- type: Damageable
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/slime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
Male: MaleSlime
Female: FemaleSlime
Unsexed: MaleSlime
Futanari: FemaleSlime # Lust-edit
Futanari: FemaleSlime # Lust-Edit
- type: Damageable
damageContainer: Biological
damageModifierSet: Slime
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
- type: Appearance
- type: Extractable
grindableSolutionName: food
# LUST STATION START
# Lust-Start
- type: Clothing
slots:
- PLUG
equipDelay: 4
unequipDelay: 4
# LUST STATION END
# Lust-End

# Subclasses

Expand Down
Loading
Loading