Лавмат, донатные вещи, ксеноморфы, коллективный разум

Content.Client/Clothing/ClientClothingSystem.cs

@@ -46,6 +46,13 @@ public sealed partial class ClientClothingSystem : ClothingSystem
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},
         {"suitstorage", "SUITSTORAGE"},
+        // Orion-Start
+        {"earsright", "EARSRIGHT"},
+        {"underwear", "UNDERWEAR"},
+        {"undershirt", "UNDERSHIRT"},
+        {"socks", "SOCKS"},
+        {"wrists", "WRISTS"},
+        // Orion-End
     };
 
     [Dependency] private IResourceCache _cache = default!;

Content.Client/Lobby/LobbyUIController.cs

@@ -57,6 +57,8 @@ public sealed partial class LobbyUIController : UIController, IOnStateEntered<Lo
     private JobPriorityEditor? _jobPriorityEditor;
     private CharacterSetupGuiSavePanel? _savePanel;
 
+    private static readonly string[] UnderwearSlots = ["underwear", "undershirt", "socks"]; // Orion
+
     /// begin starlight
     /// <summary>
     /// character editor window, see OpenCharacterSetupWindow()

Content.Shared/Chat/ChatChannel.cs

@@ -83,6 +83,7 @@ public enum ChatChannel : ushort
         /// <summary>
         ///     Unspecified.
         /// </summary>
+        ///
         Unspecified = 1 << 15,
 
         /// <summary>

Content.Shared/Humanoid/HumanoidVisualLayers.cs

@@ -37,6 +37,6 @@ public enum HumanoidVisualLayers : byte
         BodyCover, // Far Horizons
         BodyCoverCover, // Far Horizons
         Other,
-        Wings // Arcane
+        Wings, // Arcane
     }
 }

Content.Shared/Inventory/SlotFlags.cs

@@ -28,6 +28,11 @@ public enum SlotFlags
     SUITSTORAGE = 1 << 15,
     MISC = 1 << 16, // Starlight
     OUTERCLOTHING2 = 1 << 17, // Starlight
+    // Orion-Start
+    UNDERWEAR = 1 << 18,
+    UNDERSHIRT = 1 << 19,
+    SOCKS = 1 << 20,
+    // Orion-End
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml

@@ -0,0 +1,65 @@
+# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Piras314 <p1r4s@proton.me>
+# SPDX-FileCopyrightText: 2025 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+- files: ["cautery1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery1.ogg"
+
+- files: ["cautery2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery2.ogg"
+
+- files: ["hemostat.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/hemostat.ogg"
+
+- files: ["organ1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ1.ogg"
+
+- files: ["organ2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ2.ogg"
+
+- files: ["retractor1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor1.ogg"
+
+- files: ["retractor2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor2.ogg"
+
+- files: ["saw.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/saw.ogg"
+
+- files: ["scalpel1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel1.ogg"
+
+- files: ["scalpel2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
+
+- files: ["bone_setter.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Darkrell"
+  source: "https://github.com/ss14Starlight/space-station-14"
+
+- files: ["bone_saw.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Darkrell"
+  source: "https://github.com/ss14Starlight/space-station-14"

Resources/Audio/_Shitmed/Misc/attributions.yml

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Piras314 <p1r4s@proton.me>
+# SPDX-FileCopyrightText: 2025 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+- files: ["abductor","alien_teleport"]
+  license: "CC-BY-4.0"
+  copyright: 'Darkrell'
+  source: "https://github.com/ss14Starlight/space-station-14"
+
+- files: ["abducted"]
+  license: "CC-BY-SA-3.0"
+  copyright: 'Paradise Station'
+  source: "https://github.com/ParadiseSS13/Paradise"

Resources/Audio/_White/Voice/Talk/attributions.yml

@@ -0,0 +1,5 @@
+- files: ["xenomorph.ogg", "xenomorph_ask.ogg", "xenomorph_exclaim.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+

Resources/Audio/_White/Voice/Xenomorph/attributions.yml

@@ -0,0 +1,44 @@
+- files: ["xenomorph.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["xenomorph_ask.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["xenomorph_exclaim.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["cough1.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from BlueMoon station and converted to mono by @deltanedas (github)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["scream1.ogg", "scream2.ogg", "scream3.ogg", "scream4.ogg", "scream5.ogg", "scream6.ogg", "scream7.ogg", "scream8.ogg", "9.ogg", "scream10.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from BlueMoon station and converted to mono by @deltanedas (github)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["hiss1.ogg", "hiss2.ogg", "hiss3.ogg", "hiss4.ogg", "hiss5.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from BlueMoon station and converted to mono by @deltanedas (github)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["laugh1.ogg", "laugh2.ogg", "laugh3.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from BlueMoon station and converted to mono by @deltanedas (github)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["snoring1.ogg", "snoring2.ogg", "snoring3.ogg", "snoring4.ogg", "snoring5.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from BlueMoon station and converted to mono by @deltanedas (github)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+
+- files: ["xenomorphdisarm.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/tree/master/sound/alien"

Resources/Locale/en-US/_Arcane/body/organs/humanoid_xeno.ftl

@@ -0,0 +1,18 @@
+ent-BaseHumanoidXenoOrganUnGibbable = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
+ent-BaseHumanoidXenoOrgan = { ent-BaseHumanoidXenoOrganUnGibbable }
+    .desc = { ent-BaseHumanoidXenoOrganUnGibbable.desc }
+ent-OrganHumanoidXenoBrain = brain
+    .desc = The nexus of the alien mind. Thoughts you don't want to know.
+ent-OrganHumanoidXenoLungs = lungs
+    .desc = They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier.
+ent-OrganHumanoidXenoHeart = xenomorph heart
+    .desc = A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every xenomorph.
+ent-OrganHumanoidXenoStomach = stomach
+    .desc = A voracious pit.
+ent-OrganHumanoidXenoLiver = liver
+    .desc = A powerful detoxifier that neutralizes dangerous substances with ease.
+ent-OrganHumanoidXenoKidneys = kidneys
+    .desc = Paired filters, ruthlessly taking out anything superfluous.
+ent-OrganHumanoidXenoEyes = eyes
+    .desc = Eyes. They see.

Resources/Locale/en-US/_Arcane/body/parts/humanoid_xeno.ftl

@@ -0,0 +1,22 @@
+ent-PartHumanoidXeno = xenomorph body part
+    .desc = { ent-BaseItem.desc }
+ent-TorsoHumanoidXeno = xenomorph torso
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-HeadHumanoidXeno = xenomorph head
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-LeftArmHumanoidXeno = left xenomorph arm
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-RightArmHumanoidXeno = right xenomorph arm
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-LeftHandHumanoidXeno = left xenomorph hand
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-RightHandHumanoidXeno = right xenomorph hand
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-LeftLegHumanoidXeno = left xenomorph leg
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-RightLegHumanoidXeno = right xenomorph leg
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-LeftFootHumanoidXeno = left xenomorph foot
+    .desc = { ent-PartHumanoidXeno.desc }
+ent-RightFootHumanoidXeno = right xenomorph foot
+    .desc = { ent-PartHumanoidXeno.desc }

Resources/Locale/en-US/_Arcane/collective-mind/collective-mind.ftl

@@ -0,0 +1 @@
+collective-mind-humanoid-xeno = Hivemind