LuciferEOS · LuciferEOS · Jun 15, 2026 · Jun 12, 2026 · Jun 12, 2026 · Jun 12, 2026
@@ -27,4 +27,4 @@ public enum PdaVisualLayers : byte
         Flashlight,
         IdLight
     }
-}
+}
@@ -11,11 +11,9 @@
   </PropertyGroup>
   <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
-    <ProjectReference Include="../Content.Goobstation.Client/Content.Goobstation.Client.csproj" />
+    <ProjectReference Include="../Content.Inky.Shared/Content.Inky.Shared.csproj" />
     <ProjectReference Include="../Content.Trauma.Client/Content.Trauma.Client.csproj" />
-    <ProjectReference Include="../Content.Lavaland.Client/Content.Lavaland.Client.csproj" />
-    <ProjectReference Include="../Content.Medical.Client/Content.Medical.Client.csproj" />
-    <ProjectReference Include="..\Content.Inky.Shared\Content.Inky.Shared.csproj" />
+    <ProjectReference Include="../Content.Client/Content.Client.csproj" />
   </ItemGroup>
 
   <Import Project="../RobustToolbox/Imports/Client.props" />

diff --git a/Content.Inky.Server/Content.Inky.Server.csproj b/Content.Inky.Server/Content.Inky.Server.csproj
@@ -16,13 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Content.Inky.Shared\Content.Inky.Shared.csproj" />
-    <ProjectReference Include="../Content.Goobstation.Server/Content.Goobstation.Server.csproj" />
-    <ProjectReference Include="../Content.Lavaland.Server/Content.Lavaland.Server.csproj" />
-    <ProjectReference Include="../Content.Medical.Server/Content.Medical.Server.csproj" />
+    <ProjectReference Include="../Content.Inky.Shared/Content.Inky.Shared.csproj" />
+    <ProjectReference Include="../Content.Trauma.Server/Content.Trauma.Server.csproj" />
     <ProjectReference Include="../Content.Server/Content.Server.csproj" />
   </ItemGroup>
-  
+
   <Import Project="../RobustToolbox/Imports/Server.props" />
   <Import Project="../RobustToolbox/Imports/Shared.props" />
   <Import Project="../RobustToolbox/MSBuild/Robust.Properties.targets" />

diff --git a/Content.Inky.Shared/Content.Inky.Shared.csproj b/Content.Inky.Shared/Content.Inky.Shared.csproj
@@ -8,7 +8,7 @@
   <Import Project="../MSBuild/Content.props" />
 
   <ItemGroup>
-    <ProjectReference Include="../Content.Goobstation.Shared/Content.Goobstation.Shared.csproj" />
+    <ProjectReference Include="../Content.Trauma.Shared/Content.Trauma.Shared.csproj" />
     <ProjectReference Include="../Content.Shared/Content.Shared.csproj" />
   </ItemGroup>
 

diff --git a/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs b/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs
@@ -6,5 +6,5 @@ public sealed partial class CursorOffsetRequiresWieldComponent
     /// Multiplies your viewcone angle by this number when wielded.
     /// </summary>
     [DataField]
-    public float ViewAngleMultiplier = 0.3f;
+    public float ViewAngleMultiplier = 1f; // inky edit
 }
diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs
@@ -38,4 +38,4 @@ public sealed partial class PdaComponent : Component
         [ViewVariables] public string? StationAlertLevel;
         [ViewVariables] public Color StationAlertColor = Color.White;
     }
-}
+}
diff --git a/Content.Shared/PDA/PdaVisuals.cs b/Content.Shared/PDA/PdaVisuals.cs
@@ -15,4 +15,4 @@ public enum PdaUiKey
         Key
     }
 
-}
+}
diff --git a/Content.Shared/PDA/SharedPdaSystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs
@@ -85,4 +85,4 @@ public virtual void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
             // Overriden by the server
         }
     }
-}
+}
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ If you want to host or create content for SS14, go to the [Space Station 14 repo
 
 ## Links
 
-no discord server sadly right now | [Devbus Discord Server](https://discord.gg/f3rJaCuK) | [SS14 Forums](https://forum.spacestation14.com/) | [SS14 Website](https://spacestation14.com/)
+[Inky Station Discord Server](https://discord.gg/Tmjfu6Mt9p) | [Devbus Discord Server](https://discord.gg/f3rJaCuK) | [SS14 Forums](https://forum.spacestation14.com/) | [SS14 Website](https://spacestation14.com/)
 
 ## Documentation/Wiki
 

diff --git a/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl b/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl
@@ -216,3 +216,7 @@ loadout-group-boxer-envirosuit = Boxer envirosuit
 
 # Misc
 loadout-group-plasma-tank = Plasma tank
+
+# Salvage/Shaft Miner
+loadout-group-salvage-specialist-jumpsuit = Salvage Specialist Jumpsuit
+loadout-group-shaft-miner-jumpsuit = Shaft Miner Jumpsuit
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3213,7 +3213,7 @@ entities:
     - type: Transform
       pos: 6.5,-16.5
       parent: 2
-- proto: ClothingNeckCloakCe
+- proto: ClothingNeckCloakWhiteCe
   entities:
   - uid: 1096
     components:

diff --git a/Resources/Maps/_Trauma/lambda.yml b/Resources/Maps/_Trauma/lambda.yml
@@ -98163,7 +98163,7 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingNeckCloakCe
+- proto: ClothingNeckCloakWhiteCe
   entities:
   - uid: 15161
     components:
@@ -98247,7 +98247,7 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingNeckMantleCE
+- proto: ClothingNeckMantleWhiteCE
   entities:
   - uid: 15162
     components:

diff --git a/Resources/Maps/_Trauma/origin.yml b/Resources/Maps/_Trauma/origin.yml
@@ -79226,7 +79226,7 @@ entities:
     - type: Transform
       pos: -10.776614,43.48699
       parent: 2
-- proto: ClothingNeckMantleCE
+- proto: ClothingNeckMantleWhiteCE
   entities:
   - uid: 12814
     components:

diff --git a/Resources/Prototypes/Body/Species/vox.yml b/Resources/Prototypes/Body/Species/vox.yml
@@ -259,7 +259,7 @@
     damage:
       types:
         Slash: 5 # Reduce?
-  - type: Wagging
+#  - type: Wagging - trauma changes wag to be on the tail organ
 
 - type: entity
   parent: OrganBaseFleshy # Shitmed - Fleshy
@@ -357,41 +357,53 @@
   id: OrganVoxFootRight
 
 - type: entity
-  parent: [ OrganBaseBrain, OrganSpriteHumanInternal, OrganVoxInternal ]
+  parent: [ OrganBaseBrain, OrganVoxInternal ]
   id: OrganVoxBrain
+  name: cortical stack
+  description: A stack containing all the memories and experiences of a vox with some mushy brains still sticking to it.
+  components:
+  - type: Edible
+    destroyOnEmpty: false
+  - type: BorgBrain
 
 - type: entity
   parent: [ OrganVoxVisual, OrganBaseEyes, OrganVoxInternal ]
   id: OrganVoxEyes
-  # <Trauma>
-  components:
-  - type: ViewconeModifier
-    angleModifier: 1.1 # prey vision for tasty chicken...
+  # <Trauma> - INKY - fov disabled
+  #components:
+  #- type: ViewconeModifier
+  #  angleModifier: 1.1 # prey vision for tasty chicken...
   # </Trauma>
 
 - type: entity
   parent: [ OrganBaseTongue, OrganVoxInternal ]
   id: OrganVoxTongue
 
 - type: entity
-  parent: [ OrganBaseAppendix, OrganSpriteHumanInternal, OrganVoxInternal ]
+  parent: [ OrganBaseAppendix, OrganVoxInternal ]
   id: OrganVoxAppendix
 
 - type: entity
-  parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganVoxInternal ]
+  parent: [ OrganBaseEars, OrganVoxInternal ]
   id: OrganVoxEars
 
 - type: entity
   parent: [ OrganBaseLungs, OrganVoxInternal, OrganVoxMetabolizer ]
   id: OrganVoxLungs
+  name: gas exchange sacks
+  description: The organ responsible for gas exchange within a Vox.
 
 - type: entity
   parent: [ OrganBaseHeart, OrganVoxInternal, OrganVoxMetabolizer ]
   id: OrganVoxHeart
+  name: circulatory pump
+  description: A strange purple organ that pumps circulatory fluid through the body of a Vox.
 
 - type: entity
   parent: [ OrganBaseStomach, OrganVoxInternal, OrganVoxMetabolizer ]
   id: OrganVoxStomach
+  name: material processor
+  description: The organ responsible for processing materials intaken by a Vox.
   components:
   - type: Stomach
     specialDigestible:
@@ -400,9 +412,13 @@
     isSpecialDigestibleExclusive: false
 
 - type: entity
-  parent: [ OrganBaseLiver, OrganSpriteHumanInternal, OrganVoxInternal, OrganVoxMetabolizer ]
+  parent: [ OrganBaseLiver, OrganVoxInternal, OrganVoxMetabolizer ]
   id: OrganVoxLiver
+  name: primary toxin filter
+  description: One of two organs responsible for filtering toxins from the bloodstream of a Vox.
 
 - type: entity
-  parent: [ OrganBaseKidneys, OrganSpriteHumanInternal, OrganVoxInternal, OrganVoxMetabolizer ]
+  parent: [ OrganBaseKidneys, OrganVoxInternal, OrganVoxMetabolizer ]
   id: OrganVoxKidneys
+  name: auxiliary toxin filter
+  description: One of two organs responsible for filtering toxins from the bloodstream of a Vox.
diff --git a/Resources/Prototypes/Body/species_appearance.yml b/Resources/Prototypes/Body/species_appearance.yml
@@ -39,9 +39,9 @@
     - map: [ "shoes" ]
     - map: [ "ears" ]
     - map: [ "eyes" ]
-    - map: [ "belt" ]
     - map: [ "id" ]
     - map: [ "outerClothing" ]
+    - map: [ "belt" ] #inky - belts over outerwear. was a goobchange that was skipped on trauma.
     - map: [ "back" ]
     - map: [ "neck" ]
     - map: [ "suitstorage" ]

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -28,7 +28,7 @@
         - id: ClothingUniformJumpskirtChiefEngineerTurtle
         - id: ClothingHeadHatBeretEngineering
         - id: ClothingOuterWinterCE
-        - id: ClothingNeckCloakCe
+        - id: ClothingNeckCloakWhiteCe
 
 - type: entity
   id: DresserChiefMedicalOfficerFilled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -25,7 +25,6 @@
     ClothingUniformJumpsuitCentcomAgent: 3
     ClothingUniformJumpsuitCentcomFormal: 3
     ClothingUniformJumpskirtCentcomFormalDress: 3
-    ClothingUniformJumpsuitCasualCentcom: 3 # Goobstation
     ClothingHeadHatCentcom: 3
     ClothingHeadHatCentcomcap: 3
     ClothingMaskGasCentcom: 3
@@ -34,9 +33,24 @@
     ClothingOuterCoatExpensive: 1
     ClothingNeckScarfStripedCentcom: 3
     ClothingNeckCloakCentcom: 3
+    #<goob>
+    ClothingUniformJumpsuitCasualCentcom: 3 
+    ClothingOuterArmoredJacketCentralCommand: 2
+    ClothingUniformJumpskirtCentcomPencilSkirt: 3
+    ClothingNeckCloakHighCommand: 3
+    ClothingNeckCloakHighCommandCape: 2
+    ClothingNeckCloakCentComPoncho: 3
+    ClothingNeckMantleEpaulettes: 1
+    #</goob>
   contrabandInventory:
+    #<goob>
+    ClothingUniformJumpsuitGoldenLiaison: 2
+    ClothingNeckCloakGoldenCentComm: 2
+    ClothingHeadHatGoldCentcom: 2
+    #</goob>
     ToyFigurineCaptain: 1
     ToyFigurineHeadOfPersonnel: 1
+
   # <Trauma>
   emaggedInventory:
     PenCentcom: 1

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1593,8 +1593,8 @@
   id: UplinkChameleon
   name: uplink-chameleon-name
   description: uplink-chameleon-desc
-  productEntity: ClothingBackpackChameleonFillAgent
-  icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
+  productEntity: ClothingBackpackChameleonFill # goob
+  icon: { sprite: /Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi, state: icon } # Goob
   cost:
     Telecrystal: 25 # Trauma - was 4, 5x and more expensive due to how much fucking value it has
   categories:

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -204,7 +204,7 @@
   description: A robust backpack for stealing cargo's loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Backpacks/cargo.rsi
+      sprite: _Goobstation/Clothing/Back/Backpacks/cargo.rsi
 
 - type: entity
   parent: ClothingBackpack

diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -143,16 +143,14 @@
   components:
     - type: Sprite
       sprite: Clothing/Back/Duffels/hydroponics.rsi
-
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelCargo
   name: cargo duffel bag
   description: A large duffel bag for stealing cargo's precious loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Duffels/cargo.rsi
-
+      sprite: _Goobstation/Clothing/Back/Duffels/cargo.rsi # Goob
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelSalvage

diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -157,8 +157,7 @@
   description: A robust satchel for stealing cargo's loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Satchels/cargo.rsi
-
+      sprite: _Goobstation/Clothing/Back/Satchels/cargo.rsi
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelSalvage

diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -110,7 +110,7 @@
 
 - type: entity
   abstract: true
-  parent: [ClothingHeadBase, BaseClothingViewconeSmall] # Trauma
+  parent: [ClothingHeadBase] # Trauma # inky edit removed BaseClothingViewconeSmall
   id: ClothingHeadEVAHelmetBase
   name: base space helmet
   components:

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -53,7 +53,7 @@
 
 # TODO: Make a single ClothingHeadHatArmoreredBeret in goob namespace so all these items dont need to have armor values listed seperately, since they wont have seperate armor values ANYWAY!
 - type: entity
-  parent: [ClothingHeadHatBeret, BaseSecurityContraband, BaseClothingViewconeSmallIncrease] #goobstation - contraband marking
+  parent: [ClothingHeadHatBeret, BaseSecurityContraband] #goobstation - contraband marking # inky edit removed BaseClothingViewconeSmallIncrease
   id: ClothingHeadHatBeretSecurity
   name: security beret
   description: A beret with the security department's insignia. For officers that are more inclined towards style than safety.
@@ -178,9 +178,9 @@
   description: A beret with the cargo department's insignia.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hats/beret_qm.rsi
+    sprite: _Goobstation/Clothing/Head/Hats/beret_qm.rsi # Goob Station - beret edit
   - type: Clothing
-    sprite: Clothing/Head/Hats/beret_qm.rsi
+    sprite: _Goobstation/Clothing/Head/Hats/beret_qm.rsi # Goob Station - beret edit
   - type: Tag
     tags:
     - PetWearable
@@ -191,7 +191,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingHeadHatBeretRND, BaseSecurityCommandContraband, BaseClothingViewconeSmallIncrease] # Goob / Trauma edit
+  parent: [ClothingHeadHatBeretRND, BaseSecurityCommandContraband] # Goob / Trauma edit # inky edit removed BaseClothingViewconeSmallIncrease
   id: ClothingHeadHatBeretHoS
   name: head of security's beret
   description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
@@ -297,7 +297,7 @@
     - CorgiWearable
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseClothingViewconeSmallIncrease ] # Trauma
+  parent: [ ClothingHeadBase ] # Trauma # inky edit removed BaseClothingViewconeSmallIncrease
   id: ClothingHeadHatBeretMerc
   name: mercenary beret
   description: An olive beret with a badge depicting a jackal on a rock.
@@ -874,7 +874,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingHeadBase, BaseSecurityContraband, BaseClothingViewconeSmallIncrease] # Goob / Trauma edit
+  parent: [ClothingHeadBase, BaseSecurityContraband] # Goob / Trauma edit # inky edit removed BaseClothingViewconeSmallIncrease
   id: ClothingHeadHatWarden
   name: warden's cap
   description: This hat emphasizes that you are THE LAW.

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -328,7 +328,7 @@
 
 #Fire Helmet
 - type: entity
-  parent: [ClothingHeadLightBase, BaseClothingViewconeSmall]
+  parent: [ClothingHeadLightBase] # inky edit removed BaseClothingViewconeSmall
   id: ClothingHeadHelmetFire
   name: fire helmet
   description: An atmos tech's best friend. Provides some heat resistance and looks cool.
@@ -368,7 +368,7 @@
 
 #Atmos Fire Helmet
 - type: entity
-  parent: [ClothingHeadLightBase, BaseEngineeringContraband, BaseClothingViewconeSmall] # Trauma
+  parent: [ClothingHeadLightBase, BaseEngineeringContraband] # Trauma # inky edit removed BaseClothingViewconeSmall
   id: ClothingHeadHelmetAtmosFire
   name: atmos fire helmet
   description: An atmos fire helmet, able to keep the user cool in any situation.
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ public enum PdaVisualLayers : byte @@
             Flashlight,
             IdLight
         }
-    }
+    }