Content readditions.

Content.Client/Clothing/ClientClothingSystem.cs

@@ -35,6 +35,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"mask", "MASK"},
         {"outerClothing", "OUTERCLOTHING"},
         {Jumpsuit, "INNERCLOTHING"},
+        {"underwear", "UNDERWEAR"},
         {"neck", "NECK"},
         {"back", "BACKPACK"},
         {"belt", "BELT"},

Content.Server/Zombies/ZombieSystem.cs

@@ -46,6 +46,7 @@ public sealed partial class ZombieSystem : SharedZombieSystem
             SlotFlags.MASK |
             SlotFlags.NECK |
             SlotFlags.INNERCLOTHING |
+            SlotFlags.UNDERWEAR |
             SlotFlags.OUTERCLOTHING;
 
         public override void Initialize()

Content.Shared/Inventory/SlotFlags.cs

@@ -26,6 +26,7 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
+    UNDERWEAR = 1 << 16,
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

LEGAL.md

@@ -11,8 +11,8 @@ The Authors retain all copyright to their respective work submitted here.
 > [!NOTE]
 > If you want MIT-licensed code, please visit the Space Wizards' repository [here](https://github.com/space-wizards/space-station-14/) instead.
 > If they do not have something you want as MIT but we do as AGPLv3, you may ask the authors of the code to relicense it for you.
-> 
-> If you can not figure out the license of something, or who the author(s) of a feature are, please ask in our [Discord](https://discord.gg/X4QEXxUrsJ).
+>
+> If you can not figure out the license of something, or who the author(s) of a feature are, please ask in our [Discord](https://discord.gg/bA4xrT9fvh).
 
 Content contributed to this repository after commit [87c70a8](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
 See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).

README.md

@@ -1,29 +1,18 @@
-# Einstein Engines
+# Aphrodite
 
-<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="512px" /></p>
+<p align="center"><img src="https://raw.githubusercontent.com/Caldera-site-4678/Aphrodite/master/Resources/Textures/Logo/splashlogo.png" width="512px" /></p>
 
 ---
-
-Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14) built around the ideals and design inspirations of the Baystation family of servers from Space Station 13 with a focus on having modular code that anyone can use to make the RP server of their dreams.
-Our founding organization is based on a democratic system whereby our mutual contributors and downstreams have a say in what code goes into their own upstream.
-If you are a representative of a former downstream of Delta-V, we would like to invite you to contact us for an opportunity to represent your fork in this new upstream.
+Aphrodite is a fork of Floof Station, which, in turn, is a fork of Einstein Engines, which, in turn, is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14) built around the ideals and design inspirations of the Baystation family of servers from Space Station 13 with a focus on having modular code that anyone can use to make the RP server of their dreams.
 
 Space Station 14 is inspired heavily by Space Station 13 and runs on [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), a homegrown engine written in C#.
 
-As a hard fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported.
-All code present in this repository is subject to change as desired by the council of maintainers.
-
-## Official Server Policy
-
-**No official servers will ever be made for Einstein-Engines**.
-
-In order to prevent a potential conflict of interest, we will never open any server directly using the Einstein Engines codebase itself.
-Any server claiming to be an official representation of this fork is not endorsed in any way by this organization.
-We however would like to invite anyone wishing to create a server to make a fork of Einstein Engines.
+As Einstein Engines is a hard fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported.
+All code present in this repository is subject to change as desired by the maintainer team, and the payerbase.
 
 ## Links
 
-[Website](https://simplestation.org) | [Discord](https://discord.gg/X4QEXxUrsJ) | [Steam(SSMV Launcher)](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/) | [Steam(WizDen Launcher)](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone](https://spacestationmultiverse.com/downloads/)
+[Discord](https://discord.gg/bA4xrT9fvh) | [Steam(SSMV Launcher)](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/) | [Steam(WizDen Launcher)](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone](https://spacestationmultiverse.com/downloads/)
 
 ## Contributing
 

Resources/Prototypes/Aphrodite/SkirtFlippable.yml

@@ -0,0 +1,15 @@
+- type: entity
+  parent: ClothingUniformSkirtflippable
+  id: ClothingUniformYukonSkirtTurtle
+  name: Yukon Genetics worker uniform
+  description: A turtle sweater with a Navy blue skirt and blue waist straps.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/Decorskirt.rsi
+  - type: Clothing
+    sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/Decorskirt.rsi
+
+- type: entity
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingUniformYukonSkirtTurtle]
+  id: ClothingUniformYukonSkirtTurtleFlipped
+  name: Lewd Yukon Genetics worker uniform

Resources/Prototypes/Aphrodite/Uniformflippableyml.yml

@@ -0,0 +1,85 @@
+- type: entity
+  parent: [BaseFoldable, ClothingUniformBase]
+  id: ClothingUniformflippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  parent: ClothingUniformflippable
+  id: ClothingUniformfoldFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true
+
+#skirt
+
+- type: entity
+  parent: [BaseFoldable, ClothingUniformSkirtBase]
+  id: ClothingUniformSkirtflippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  parent: ClothingUniformSkirtflippable
+  id: ClothingUniformfoldSkirtFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -48,7 +48,7 @@
     FoodPoppy: 1
     ClothingHeadHatGladiator: 1
     ClothingUniformJumpsuitGladiator: 1
-    ClothingUniformSkirtTurtle: 2 # Nyano - Clothing addition
+    ClothingUniformYukonSkirtTurtle: 2 # Aphrodite - Clothing addition
     ClothingUniformSwimsuitBlue: 2 # Nyano - Clothing addition
     ClothingCostumeBunnySuit: 2 # Nyano - Clothing addition
     ClothingHeadHatBunny: 2 # Nyano - Clothing addition