Let borgs spawn with hats (ProjectOmu#1042)

* Let the borgs spawn with hats

* Added hooks for borg species override

* Comparing a string...

* C# style null check comparison

* Forgot an Omu comment

* Added more borg hats to loadout

* Made logic based on borg job for clarity

* Fixed possible null dereference

* Apply suggestions from code review

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

Author: feistyfedora

Content.Client/Lobby/LobbyUIController.cs

@@ -600,7 +600,8 @@ public EntityUid LoadProfileEntity(HumanoidCharacterProfile? humanoid, JobProtot
         {
             // Special type like borg or AI, do not spawn a human just spawn the entity.
             dummyEnt = EntityManager.SpawnEntity(previewEntity, MapCoordinates.Nullspace);
-            return dummyEnt;
+            if (job?.Name != "job-name-borg") // Omu, don't return if borg
+                return dummyEnt;
         }
         else if (humanoid is not null)
         {

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -205,7 +205,8 @@ public EntityUid SpawnPlayerMob(
         }
 
         // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
-        if (prototype?.JobEntity != null)
+        if (prototype?.JobEntity != null
+         && prototype.Name != "job-name-borg") // Omu, only skip if AI so borgs can have a loadout
         {
             DebugTools.Assert(entity is null);
             var jobEntity = Spawn(prototype.JobEntity, coordinates);
@@ -224,6 +225,10 @@ public EntityUid SpawnPlayerMob(
 
         string speciesId = profile != null ? profile.Species : SharedHumanoidAppearanceSystem.DefaultSpecies;
 
+        // Omu, overwrite species to Cyborg if playing JobBorg
+        if (prototype?.Name == "job-name-borg")
+            speciesId = "Cyborg";
+
         if (!_prototypeManager.TryIndex<SpeciesPrototype>(speciesId, out var species))
             throw new ArgumentException($"Invalid species prototype was used: {speciesId}");
 

Resources/Locale/en-US/_Omu/preferences/loadout-groups.ftl

@@ -28,3 +28,6 @@ loadout-group-courier-id = Courier ID
 loadout-group-courier-envirohelm = Courier envirohelm
 loadout-group-courier-envirosuit = Courier envirosuit
 loadout-group-courier-envirogloves = Courier envirogloves
+
+# Cyborg
+loadout-group-cyborg-head = Cyborg head

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -161,6 +161,8 @@
   id: JobBorg
   nameDataset: NamesBorg
   canCustomizeName: true
+  groups: # Omu
+  - CyborgHead
 
 - type: roleLoadout
   id: JobStationAi

Resources/Prototypes/_Omu/Loadouts/Jobs/Misc/cyborg.yml

@@ -0,0 +1,66 @@
+# Head
+- type: loadout
+  id: PropellerHead
+  equipment:
+    head: ClothingHeadHatPropeller
+
+- type: loadout
+  id: PartyHatRedHead
+  equipment:
+    head: ClothingHeadHatPartyRed
+
+- type: loadout
+  id: BeanieHead
+  equipment:
+    head: ClothingHeadHatCanadaBeanie
+    
+- type: loadout
+  id: ChefHatHead
+  equipment:
+    head: ClothingHeadHatChef
+
+- type: loadout
+  id: FezHatHead
+  equipment:
+    head: ClothingHeadHatFez
+
+- type: loadout
+  id: FedoraHatHead
+  equipment:
+    head: ClothingHeadHatFedoraBrown
+
+- type: loadout
+  id: WhiteCowboyHead
+  equipment:
+    head: ClothingHeadHatCowboyWhite
+
+- type: loadout
+  id: TophatHead
+  equipment:
+    head: ClothingHeadHatTophat
+
+- type: loadout
+  id: SafariHead
+  equipment:
+    head: ClothingHeadSafari
+    
+- type: loadout
+  id: JesterHead
+  equipment:
+    head: ClothingHeadHatJester
+
+- type: loadout
+  id: HeadSlimeHead
+  equipment:
+    head: ClothingHeadHatAnimalHeadslime
+    
+- type: loadout
+  id: HeadFlowerHead
+  equipment:
+    head: ClothingHeadHatHairflower
+
+- type: loadout
+  id: HeadbandSkull
+  equipment:
+    head: ClothingHeadBandSkull
+    

Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml

@@ -399,3 +399,24 @@
   name: loadout-group-clown-belt
   loadouts:
   - ClownFoamSabre # Omu - Add foam sabre to the clown's loadout.
+
+# Cyborg
+- type: loadoutGroup
+  id: CyborgHead
+  name: loadout-group-cyborg-head
+  minLimit: 0
+  loadouts:
+  - PropellerHead
+  - PartyHatRedHead
+  - BeanieHead
+  - ChefHead
+  - FezHatHead
+  - FedoraHatHead
+  - WhiteCowboyHead
+  - TophatHead
+  - SafariHead
+  - JesterHead
+  - HeadSlimeHead
+  - HeadFlowerHead
+  - HeadbandSkull
+  

Resources/Prototypes/_Shitmed/Species/cyborg.yml

@@ -9,7 +9,7 @@
   id: Cyborg
   name: species-name-human
   roundStart: false
-  prototype: BorgChassisSelectable
+  prototype: PlayerBorgBattery # Omu, borgs need batteries
   sprites: CyborgSprites
   defaultSkinTone: "#fff9e2"
   markingLimits: MobHumanMarkingLimits