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 0000000000..8b1b51f4f5 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/Centcom.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/meta.json b/Resources/Textures/Interface/Misc/markers.rsi/meta.json index 8ef19b96d2..cb45857293 100644 --- a/Resources/Textures/Interface/Misc/markers.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/markers.rsi/meta.json @@ -1,251 +1,196 @@ { "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": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", "states": [ { - "name": "AI", + "name": "AI" + }, + { + "name": "Assistant" + }, + { + "name": "Atmospheric Technician" + }, + { + "name": "Bartender" + }, + { + "name": "Botanist" + }, + { + "name": "Captain" + }, + { + "name": "Cargo Technician" + }, + { + "name": "Centcom" + }, + { + "name": "Chaplain" + }, + { + "name": "Chemist" + }, + { + "name": "Chief Engineer" + }, + { + "name": "Chief Medical Officer" + }, + { + "name": "Clown" + }, + { + "name": "Cook" + }, + { + "name": "Curator" }, { - "name": "Assistant", + "name": "Cyborg" }, { - "name": "Atmospheric Technician", - + "name": "Detective" }, { - "name": "Bartender", - + "name": "Geneticist" }, { - "name": "Botanist", - + "name": "Head of Personnel" }, { - "name": "Captain", - + "name": "Head of Security" }, { - "name": "Cargo Technician", - + "name": "Janitor" }, { - "name": "Chaplain", - + "name": "Lawyer" }, { - "name": "Chemist", - + "name": "Medical Doctor" }, { - "name": "Chief Engineer", - + "name": "Mime" }, { - "name": "Chief Medical Officer", - + "name": "Paramedic" }, { - "name": "Clown", - + "name": "Prisoner" }, { - "name": "Cook", - + "name": "Psychologist" }, { - "name": "Curator", - + "name": "Quartermaster" }, { - "name": "Cyborg", - + "name": "Research Director" }, { - "name": "Detective", - + "name": "Roboticist" }, { - "name": "Geneticist", - + "name": "Scientist" }, { - "name": "Head of Personnel", - + "name": "Security Officer" }, { - "name": "Head of Security", - + "name": "Shaft Miner" }, { - "name": "Janitor", - + "name": "Station Engineer" }, { - "name": "Lawyer", - + "name": "Virologist" }, { - "name": "Medical Doctor", - + "name": "Warden" }, { - "name": "Mime", - + "name": "cross_blue" }, { - "name": "Paramedic", - + "name": "cross_green" }, { - "name": "Prisoner", - + "name": "cross_pink" }, { - "name": "Psychologist", - + "name": "cross_red" }, { - "name": "Quartermaster", - + "name": "observer_start" }, { - "name": "Research Director", - + "name": "spawner_ai" }, { - "name": "Roboticist", - + "name": "spawner_grenade" }, { - "name": "Scientist", - + "name": "spawner_hitscan" }, { - "name": "Security Officer", - + "name": "spawner_launcher" }, { - "name": "Shaft Miner", - + "name": "spawner_launcher_ammo" }, { - "name": "Station Engineer", - + "name": "spawner_magnum_ammo" }, { - "name": "Virologist", - + "name": "spawner_melee" }, { - "name": "Warden", - + "name": "spawner_pistol" }, { - "name": "cross_blue", - + "name": "spawner_pistol_ammo" }, { - "name": "cross_green", - + "name": "spawner_revolver" }, { - "name": "cross_pink", - + "name": "spawner_rifle" }, { - "name": "cross_red", - + "name": "spawner_rifle_ammo" }, { - "name": "observer_start", - + "name": "spawner_shotgun" }, { - "name": "spawner_ai", - + "name": "spawner_shotgun_ammo" }, { - "name": "spawner_grenade", - + "name": "spawner_smg" }, { - "name": "spawner_hitscan", - + "name": "spawner_sniper" }, { - "name": "spawner_launcher", - + "name": "spawner_trash" }, { - "name": "spawner_launcher_ammo", - + "name": "spawner_xenoai" }, { - "name": "spawner_magnum_ammo", - + "name": "spawner_toy" }, { - "name": "spawner_melee", - - }, - { - "name": "spawner_pistol", - - }, - { - "name": "spawner_pistol_ammo", - - }, - { - "name": "spawner_revolver", - - }, - { - "name": "spawner_rifle", - - }, - { - "name": "spawner_rifle_ammo", - - }, - { - "name": "spawner_shotgun", - - }, - { - "name": "spawner_shotgun_ammo", - - }, - { - "name": "spawner_smg", - - }, - { - "name": "spawner_sniper", - - }, - { - "name": "spawner_trash", - - }, - { - "name": "spawner_xenoai", - - }, - { - "name": "spawner_toy", - - }, - { - "name": "spawner_figure", - + "name": "spawner_figure" } ] }