From 6b451da1ef20d7dde6339b167c998378e0d5cfa0 Mon Sep 17 00:00:00 2001 From: Memeji Date: Mon, 23 Sep 2024 12:56:26 -0500 Subject: [PATCH] Fixing merge conflict --- .../Leash/Components/LeashAnchorComponent.cs | 0 .../{Floof => Floofstation}/Leash/Components/LeashComponent.cs | 0 .../{Floof => Floofstation}/Leash/Components/LeashedComponent.cs | 0 .../{Floof => Floofstation}/Leash/LeashDoAfterEvents.cs | 0 Content.Shared/{Floof => Floofstation}/Leash/LeashSystem.cs | 0 .../Traits/Components/FixtureDensityModifier.cs | 0 .../{Floof => Floofstation}/Traits/Events/CummingDoAfterEvent.cs | 0 .../{Floof => Floofstation}/Traits/Events/MilkingDoAfterEvent.cs | 0 .../Traits/Events/SquirtingDoAfterEvent.cs | 0 .../{Floof => Floofstation}/Traits/TraitStatModifierSystem.cs | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename Content.Shared/{Floof => Floofstation}/Leash/Components/LeashAnchorComponent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Leash/Components/LeashComponent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Leash/Components/LeashedComponent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Leash/LeashDoAfterEvents.cs (100%) rename Content.Shared/{Floof => Floofstation}/Leash/LeashSystem.cs (100%) rename Content.Shared/{Floof => Floofstation}/Traits/Components/FixtureDensityModifier.cs (100%) rename Content.Shared/{Floof => Floofstation}/Traits/Events/CummingDoAfterEvent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Traits/Events/MilkingDoAfterEvent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Traits/Events/SquirtingDoAfterEvent.cs (100%) rename Content.Shared/{Floof => Floofstation}/Traits/TraitStatModifierSystem.cs (100%) diff --git a/Content.Shared/Floof/Leash/Components/LeashAnchorComponent.cs b/Content.Shared/Floofstation/Leash/Components/LeashAnchorComponent.cs similarity index 100% rename from Content.Shared/Floof/Leash/Components/LeashAnchorComponent.cs rename to Content.Shared/Floofstation/Leash/Components/LeashAnchorComponent.cs diff --git a/Content.Shared/Floof/Leash/Components/LeashComponent.cs b/Content.Shared/Floofstation/Leash/Components/LeashComponent.cs similarity index 100% rename from Content.Shared/Floof/Leash/Components/LeashComponent.cs rename to Content.Shared/Floofstation/Leash/Components/LeashComponent.cs diff --git a/Content.Shared/Floof/Leash/Components/LeashedComponent.cs b/Content.Shared/Floofstation/Leash/Components/LeashedComponent.cs similarity index 100% rename from Content.Shared/Floof/Leash/Components/LeashedComponent.cs rename to Content.Shared/Floofstation/Leash/Components/LeashedComponent.cs diff --git a/Content.Shared/Floof/Leash/LeashDoAfterEvents.cs b/Content.Shared/Floofstation/Leash/LeashDoAfterEvents.cs similarity index 100% rename from Content.Shared/Floof/Leash/LeashDoAfterEvents.cs rename to Content.Shared/Floofstation/Leash/LeashDoAfterEvents.cs diff --git a/Content.Shared/Floof/Leash/LeashSystem.cs b/Content.Shared/Floofstation/Leash/LeashSystem.cs similarity index 100% rename from Content.Shared/Floof/Leash/LeashSystem.cs rename to Content.Shared/Floofstation/Leash/LeashSystem.cs diff --git a/Content.Shared/Floof/Traits/Components/FixtureDensityModifier.cs b/Content.Shared/Floofstation/Traits/Components/FixtureDensityModifier.cs similarity index 100% rename from Content.Shared/Floof/Traits/Components/FixtureDensityModifier.cs rename to Content.Shared/Floofstation/Traits/Components/FixtureDensityModifier.cs diff --git a/Content.Shared/Floof/Traits/Events/CummingDoAfterEvent.cs b/Content.Shared/Floofstation/Traits/Events/CummingDoAfterEvent.cs similarity index 100% rename from Content.Shared/Floof/Traits/Events/CummingDoAfterEvent.cs rename to Content.Shared/Floofstation/Traits/Events/CummingDoAfterEvent.cs diff --git a/Content.Shared/Floof/Traits/Events/MilkingDoAfterEvent.cs b/Content.Shared/Floofstation/Traits/Events/MilkingDoAfterEvent.cs similarity index 100% rename from Content.Shared/Floof/Traits/Events/MilkingDoAfterEvent.cs rename to Content.Shared/Floofstation/Traits/Events/MilkingDoAfterEvent.cs diff --git a/Content.Shared/Floof/Traits/Events/SquirtingDoAfterEvent.cs b/Content.Shared/Floofstation/Traits/Events/SquirtingDoAfterEvent.cs similarity index 100% rename from Content.Shared/Floof/Traits/Events/SquirtingDoAfterEvent.cs rename to Content.Shared/Floofstation/Traits/Events/SquirtingDoAfterEvent.cs diff --git a/Content.Shared/Floof/Traits/TraitStatModifierSystem.cs b/Content.Shared/Floofstation/Traits/TraitStatModifierSystem.cs similarity index 100% rename from Content.Shared/Floof/Traits/TraitStatModifierSystem.cs rename to Content.Shared/Floofstation/Traits/TraitStatModifierSystem.cs