From b8ab364c39b45a85c2386e4d60b35078000cfb85 Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 10 Mar 2021 19:52:57 +0000 Subject: [PATCH] Centcom Official ghost role #3586 * Initial * EE * indent fix * Oops * Applied Reviews * Removed Centcom Official Spawns * Fixes Icon * added component to ignored --- Content.Client/IgnoredComponents.cs | 1 + .../Entities/Effects/Markers/spawn_points.yml | 2 - .../Prototypes/Entities/Mobs/Player/human.yml | 17 ++ .../Roles/Jobs/Command/centcom_official.yml | 13 + .../Interface/Misc/job_icons.rsi/meta.json | 104 +++----- .../Interface/Misc/markers.rsi/Centcom.png | Bin 0 -> 6917 bytes .../Interface/Misc/markers.rsi/meta.json | 237 +++++++----------- 7 files changed, 158 insertions(+), 216 deletions(-) create mode 100644 Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml create mode 100644 Resources/Textures/Interface/Misc/markers.rsi/Centcom.png diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index 4c3502512c..bc72033ad1 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -243,6 +243,7 @@ namespace Content.Client "Shovel", "ReagentTank", "UtilityAI", + "GhostRoleMobSpawner", }; } } diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml index 3b1faefe13..683e9bc725 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml @@ -16,7 +16,6 @@ - type: SpawnPoint spawn_type: LateJoin - - type: entity name: observer spawn point id: SpawnPointObserver @@ -26,4 +25,3 @@ state: observer_start - type: SpawnPoint spawn_type: Observer - diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 3fc7d97753..f245a7e8d6 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -24,3 +24,20 @@ - type: AiFactionTag factions: - NanoTrasen + +- type: entity + name: centcom official + parent: HumanMob_Content + id: HumanMob_CentcomOfficial + components: + - type: Icon + sprite: Interface/Misc/markers.rsi + state: Centcom + - type: GhostRoleMobSpawner + prototype: HumanMob_CentcomOfficial + deleteOnSpawn: true + makeSentient: false + name: centcom official + description: Inspect the station, jot down performance reviews for heads of staff, bug the Captain. + - type: UtilityAI + startingGear: CentcomGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml new file mode 100644 index 0000000000..b1c1f71de8 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -0,0 +1,13 @@ +- type: startingGear + id: CentcomGear + equipment: + innerclothing: ClothingUniformJumpsuitCentcomOfficial + shoes: ClothingShoesBootsJack + head: ClothingHeadHatCentcom + eyes: ClothingEyesGlassesSunglasses + gloves: ClothingHandsGlovesColorBlack + outerclothing: ClothingOuterVestKevlar + idcard: CentcomPDA + ears: ClothingHeadsetAltCommand + pocket1: Paper + pocket2: Pen diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index a545f5fc5b..0b55d8ace7 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,145 +1,113 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", "size": { "x": 8, "y": 8 }, "states": [ { - "name": "Detective", - + "name": "Detective" }, { - "name": "QuarterMaster", - + "name": "QuarterMaster" }, { - "name": "Botanist", - + "name": "Botanist" }, { - "name": "AtmosphericTechnician", - + "name": "AtmosphericTechnician" }, { - "name": "Nanotrasen", - + "name": "Nanotrasen" }, { - "name": "Prisoner", - + "name": "Prisoner" }, { - "name": "Janitor", - + "name": "Janitor" }, { - "name": "Chemist", - + "name": "Chemist" }, { - "name": "StationEngineer", - + "name": "StationEngineer" }, { - "name": "SecurityOfficer", - + "name": "SecurityOfficer" }, { - "name": "NoId", - + "name": "NoId" }, { - "name": "ChiefMedicalOfficer", - + "name": "ChiefMedicalOfficer" }, { - "name": "Roboticist", - + "name": "Roboticist" }, { - "name": "Chaplain", - + "name": "Chaplain" }, { - "name": "Lawyer", - + "name": "Lawyer" }, { - "name": "Unknown", - + "name": "Unknown" }, { - "name": "Librarian", - + "name": "Librarian" }, { - "name": "CargoTechnician", - + "name": "CargoTechnician" }, { - "name": "Scientist", - + "name": "Scientist" }, { - "name": "Geneticist", - + "name": "Geneticist" }, { - "name": "Clown", - + "name": "Clown" }, { - "name": "Captain", - + "name": "Captain" }, { - "name": "HeadOfPersonnel", - + "name": "HeadOfPersonnel" }, { - "name": "Virologist", - + "name": "Virologist" }, { - "name": "ShaftMiner", - + "name": "ShaftMiner" }, { - "name": "Assistant", - + "name": "Assistant" }, { - "name": "ChiefEngineer", - + "name": "ChiefEngineer" }, { - "name": "Bartender", - + "name": "Bartender" }, { - "name": "HeadOfSecurity", - + "name": "HeadOfSecurity" }, { - "name": "MedicalDoctor", - + "name": "MedicalDoctor" }, { - "name": "Chef", - + "name": "Chef" }, { - "name": "Warden", - + "name": "Warden" }, { - "name": "ResearchDirector", - + "name": "ResearchDirector" }, { - "name": "Mime", - + "name": "Mime" } ] } diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Centcom.png b/Resources/Textures/Interface/Misc/markers.rsi/Centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..8b1b51f4f5b1ae7159c1adac0782f55338c56a73 GIT binary patch literal 6917 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