Give every job their fancy ID types.

2020-02-24 16:58:25 +01:00
parent 15fa417a4f
commit 58ab7631c2
16 changed files with 23 additions and 5 deletions
--- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
+++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
@@ -38,7 +38,7 @@ namespace Content.IntegrationTests.Tests

                human = entityMan.SpawnEntity("HumanMob_Content", MapCoordinates.Nullspace);
                uniform = entityMan.SpawnEntity("JanitorUniform", MapCoordinates.Nullspace);
-                idCard = entityMan.SpawnEntity("IDCardStandard", MapCoordinates.Nullspace);
+                idCard = entityMan.SpawnEntity("AssistantIDCard", MapCoordinates.Nullspace);
                pocketItem = entityMan.SpawnEntity("FlashlightLantern", MapCoordinates.Nullspace);
                var tooBigItem = entityMan.SpawnEntity("RedToolboxItem", MapCoordinates.Nullspace);

--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -13,7 +13,6 @@ using Content.Server.Mobs;
 using Content.Server.Mobs.Roles;
 using Content.Server.Players;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.Jobs;
 using Content.Shared.Preferences;
 using Robust.Server.Interfaces.Maps;
@@ -39,6 +38,7 @@ using Robust.Shared.Timers;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
+using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

 namespace Content.Server.GameTicking
 {
@@ -481,10 +481,14 @@ namespace Content.Server.GameTicking

        private void EquipIdCard(IEntity mob, string characterName, JobPrototype jobPrototype)
        {
-            var card = _entityManager.SpawnEntity("IDCardStandard", mob.Transform.GridPosition);
-
            var inventory = mob.GetComponent<InventoryComponent>();
-            inventory.Equip(EquipmentSlotDefines.Slots.IDCARD, card.GetComponent<ClothingComponent>());
+
+            if (!inventory.TryGetSlotItem(Slots.IDCARD, out ItemComponent cardItem))
+            {
+                return;
+            }
+
+            var card = cardItem.Owner;

            var cardComponent = card.GetComponent<IdCardComponent>();
            cardComponent.FullName = characterName;
--- a/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
+++ b/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
@@ -15,3 +15,4 @@
    innerclothing: UniformCargoTech
    backpack: BackpackClothing
    shoes: ShoesBlack
+    idcard: CargoIDCard
--- a/Resources/Prototypes/Jobs/Civilian/Assistant.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Assistant.yml
@@ -17,4 +17,5 @@
    innerclothing: UniformAssistant
    backpack: BackpackClothing
    shoes: ShoesBlack
+    idcard: AssistantIDCard

--- a/Resources/Prototypes/Jobs/Civilian/Clown.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Clown.yml
@@ -16,3 +16,4 @@
    shoes: ShoesClown
    mask: MaskClown
    pocket1: BikeHorn
+    idcard: ClownIDCard
--- a/Resources/Prototypes/Jobs/Civilian/Janitor.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Janitor.yml
@@ -19,3 +19,4 @@
    backpack: BackpackClothing
    shoes: ShoesGaloshes
    head: HatPurplesoft
+    idcard: JanitorIDCard
--- a/Resources/Prototypes/Jobs/Command/Captain.yml
+++ b/Resources/Prototypes/Jobs/Command/Captain.yml
@@ -33,3 +33,4 @@
    eyes: SunGlasses
    gloves: GlovesCaptain
    outerclothing: OuterclothingCaparmor
+    idcard: CaptainIDCard
--- a/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
+++ b/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
@@ -26,3 +26,4 @@
    backpack: BackpackClothing
    shoes: ShoesBrown
    head: HatHopcap
+    idcard: HoPIDCard
--- a/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
@@ -22,3 +22,4 @@
    innerclothing: UniformChiefEngineer
    backpack: BackpackEngineering
    shoes: ShoesBrown
+    idcard: CEIDCard
--- a/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
@@ -20,3 +20,4 @@
    backpack: BackpackEngineering
    shoes: ShoesWorkboots
    outerclothing: OuterclothingHazard
+    idcard: EngineeringIDCard
--- a/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
@@ -23,3 +23,4 @@
    backpack: BackpackMedical
    shoes: ShoesBrown
    outerclothing: OuterclothingLabcoatcmo
+    idcard: CMOIDCard
--- a/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
+++ b/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
@@ -19,3 +19,4 @@
    backpack: BackpackMedical
    shoes: ShoesWhite
    outerclothing: OuterclothingLabcoatmedspecopen
+    idcard: MedicalIDCard
--- a/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
+++ b/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
@@ -21,3 +21,4 @@
    backpack: BackpackClothing
    shoes: ShoesBrown
    outerclothing: OuterclothingLabcoatgenopen
+    idcard: RDIDCard
--- a/Resources/Prototypes/Jobs/Science/Scientist.yml
+++ b/Resources/Prototypes/Jobs/Science/Scientist.yml
@@ -19,3 +19,4 @@
    backpack: BackpackClothing
    shoes: ShoesWhite
    outerclothing: OuterclothingLabcoattoxopen
+    idcard: ResearchIDCard
--- a/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
+++ b/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
@@ -24,3 +24,4 @@
    outerclothing: OuterclothingHoSTrenchcoat
    eyes: SecGlasses
    head: HatBeretHoS
+    idcard: HoSIDCard
--- a/Resources/Prototypes/Jobs/Security/SecurityOfficer.yml
+++ b/Resources/Prototypes/Jobs/Security/SecurityOfficer.yml
@@ -21,3 +21,4 @@
    shoes: ShoesJackboots
    eyes: SecGlasses
    outerclothing: OuterclothingArmorsec
+    idcard: SecurityIDCard