From: Nox Date: Fri, 26 Dec 2025 21:33:43 +0000 (-0500) Subject: ERT Overhaul 3/3: Loadouts (#38481) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=abeeb910fb1c5639f6c6cc7134dff583f88708a4;p=space-station-14.git ERT Overhaul 3/3: Loadouts (#38481) * Initial commit: Added ERT web vest and sprites, added ERT magboots. Signed-off-by: Nox38 * Added duffle bag and magboots Signed-off-by: Nox38 * Half finished updating the web vest Signed-off-by: Nox38 * Removed unused items Signed-off-by: Nox38 * Added ERT chest rig, changed sprites of backpacks Signed-off-by: Nox38 * Parented all ERT hardsuit stats to nukie hardsuits Signed-off-by: Nox38 * fixed naming Signed-off-by: Nox38 * Added equipment to be used by ERT. Signed-off-by: Nox38 * Added flamethrower suffix Signed-off-by: Nox38 * Added hydra filled with frag grenades Signed-off-by: Nox38 * Made basic grenades centcomm restricted Signed-off-by: Nox38 * Made energy swords central command contraband Signed-off-by: Nox38 * Added ERT chest rig, changed sprites of backpacks Signed-off-by: Nox38 * Parented all ERT hardsuit stats to nukie hardsuits Signed-off-by: Nox38 * fixed naming Signed-off-by: Nox38 * Added equipment to be used by ERT. Signed-off-by: Nox38 * Added flamethrower suffix Signed-off-by: Nox38 * Added hydra filled with frag grenades Signed-off-by: Nox38 * Made basic grenades centcomm restricted Signed-off-by: Nox38 * Made energy swords central command contraband Signed-off-by: Nox38 * First implementation of humanoid.yml Signed-off-by: Nox38 * Added leader, chaplain, and half implemented paladin Signed-off-by: Nox38 * Bit more work on chaplain Signed-off-by: Nox38 * Parented ERT backpacks to syndicate ones Signed-off-by: Nox38 * Revert "Parented ERT backpacks to syndicate ones" This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc. :wq# * Parented ERT backpacks to syndicate ones Signed-off-by: Nox38 * changed size of ERT backpacks Signed-off-by: Nox38 * Started adding engineer Signed-off-by: Nox38 * Unparented ERT duffels from syndicate ones Signed-off-by: Nox38 * Finished ERT security, Leader, and Chaplain. Issue remaining with the fills and shotgun ammo, rifleman half done. Signed-off-by: Nox38 * Added all loadouts Signed-off-by: Nox38 * Updated labels and containers Signed-off-by: Nox38 * Added names, finished loadouts. Signed-off-by: Nox38 * Tested loadouts, added chaplain job icon (finally), ready to go! Signed-off-by: Nox38 * Added ERT survival box with double emergency tank Signed-off-by: Nox38 * ERT now use double tanks by default Signed-off-by: Nox38 * Misc fixes Signed-off-by: Nox38 * Fixed belt Signed-off-by: Nox38 * Fixed belt sprites Signed-off-by: Nox38 * Fixed test fails Signed-off-by: Nox38 * Minor spelling mistake: Signed-off-by: Nox38 * Fixed all known issues with the PR, ready for review! Signed-off-by: Nox38 * Fixed ERT medic backpack sprite Signed-off-by: Nox38 * Fixed random metadata Signed-off-by: Nox38 * Fixed test fail Signed-off-by: Nox38 * Fixed test fail I hope? Signed-off-by: Nox38 * defintely fixed test fails Signed-off-by: Nox38 * removed flamethrower Signed-off-by: Nox38 * Slight loadout fixes to bring everything up to date. Signed-off-by: Nox38 * fix Signed-off-by: Nox38 * Made C4 CC contra, reverted Incen to syni contra Signed-off-by: Nox38 * reverted contraband Signed-off-by: Nox38 * revert the rest of the contraband Signed-off-by: Nox38 * revert contraband Signed-off-by: Nox38 * Finished reverting contraband Signed-off-by: Nox38 * Heisentest * Replaced the melee ert security with a marksman Signed-off-by: Nox38 * Added explosion resistance to backpacks Signed-off-by: Nox38 * Added label component to spray bottles. Signed-off-by: Nox38 * Added suffixes to the space cleaner bottles Signed-off-by: Nox38 * Removed ERT duffel bag, made engi loadouts work without a duffel (still finishing medic loadouts) Signed-off-by: Nox38 * Removed ERT duffel bag. Signed-off-by: Nox38 * Finished updating loadouts to account for removed duffel bag. Signed-off-by: Nox38 * Replaced armed engineer's C4 with explosive cord * Replaced leader's XL8 with a standard Lecter * Updated leader loadout * Minor fix to ERT leader Signed-off-by: Nox38 * fix formatting * Fixed rifleman, armed engineer, and test fail * Finished vanguard, chaplain. * Fixed minor spelling mistake * Gave ERT medics back their omnizine * Added ERT security breacher, made ERT survival boxes 2x2. * Finished implementing security shotgunner * one small thing --------- Signed-off-by: Nox38 Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl index 3a621695f5..69bd357af3 100644 --- a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl +++ b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl @@ -15,8 +15,17 @@ name-format-nukie-generic = {$part0} {$part1} name-format-nukie-agent = Corpsman {$part0} name-format-nukie-commander = Commander {$part0} name-format-nukie-operator = Operator {$part0} -# " <name>" + name-format-ert = {$part0} {$part1} +name-format-ert-leader = Sergeant {$part0} +name-format-ert-specialist = Specialist {$part0} +name-format-ert-pointman = Pointman {$part0} +name-format-ert-officer = Officer {$part0} +name-format-ert-rifle = Rifleman {$part0} +name-format-ert-grenade = Grenadier {$part0} +name-format-ert-vanguard = Vanguard {$part0} +name-format-ert-doctor = Doctor {$part0} +name-format-ert-corpsman = Corpsman {$part0} # "<appearance> <type>" name-format-book = {$part0} {$part1} diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index f68deb7750..a5765eadea 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -320,19 +320,16 @@ - type: entity - parent: BoxCardboard + parent: BoxCardboardSmall # Cannot fit 3x3 boxes into already-filled ERT backpacks. id: BoxSurvivalMilitaryDouble suffix: Military O2 description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank. components: - type: StorageFill contents: - - id: ClothingMaskBreath - id: DoubleEmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull - type: Sprite layers: - state: internals @@ -345,12 +342,9 @@ components: - type: StorageFill contents: - - id: ClothingMaskBreath - id: DoubleEmergencyNitrogenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull - type: Sprite layers: - state: internals diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index f8cbae86a4..51a9b7a02c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -78,11 +78,6 @@ - type: Sprite sprite: Markers/jobs.rsi state: ertleader - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirstLeader - - NamesMilitaryLast - nameFormat: name-format-ert - type: RandomHumanoidSpawner settings: ERTLeader @@ -99,18 +94,17 @@ job: ERTLeader - type: Loadout prototypes: [ ERTLeaderGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: RandomMetadata nameSegments: - - NamesMilitaryFirstLeader - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-leader - type: entity id: RandomHumanoidSpawnerERTLeaderEVA parent: RandomHumanoidSpawnerERTLeader name: ERT leader - suffix: ERTRole, Armored EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi @@ -122,39 +116,25 @@ id: ERTLeaderEVA parent: ERTLeader components: - - type: GhostRole - name: ghost-role-information-ert-leader-name - description: ghost-role-information-ert-leader-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTLeader - type: Loadout prototypes: [ ERTLeaderGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity - id: RandomHumanoidSpawnerERTLeaderEVALecter + id: RandomHumanoidSpawnerERTLeaderArmed parent: RandomHumanoidSpawnerERTLeaderEVA - suffix: ERTRole, Lecter, EVA + suffix: ERTRole, Armed, EVA components: - type: RandomHumanoidSpawner - settings: ERTLeaderEVALecter + settings: ERTLeaderArmed - type: randomHumanoidSettings - id: ERTLeaderEVALecter + id: ERTLeaderArmed parent: ERTLeaderEVA components: - - type: GhostRole - name: ghost-role-information-ert-leader-name - description: ghost-role-information-ert-leader-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTLeader - type: Loadout - prototypes: [ ERTLeaderGearEVALecter ] - roleLoadout: [ RoleSurvivalEVA ] + prototypes: [ ERTLeaderGearArmed ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## ERT Chaplain @@ -166,12 +146,7 @@ components: - type: Sprite sprite: Markers/jobs.rsi - state: chaplain #needs an ERT variant once a good suit it made. - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirst - - NamesMilitaryLast - nameFormat: name-format-ert + state: ertchaplain - type: RandomHumanoidSpawner settings: ERTChaplain @@ -189,22 +164,21 @@ job: ERTChaplain - type: RandomMetadata nameSegments: - - NamesMilitaryFirst - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-specialist - type: Loadout prototypes: [ ERTChaplainGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity id: RandomHumanoidSpawnerERTChaplainEVA parent: RandomHumanoidSpawnerERTChaplain name: ERT chaplain - suffix: ERTRole, Enviro EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi - state: chaplain #needs an ERT variant once a good suit it made. + state: ertchaplaineva - type: RandomHumanoidSpawner settings: ERTChaplainEVA @@ -212,17 +186,9 @@ id: ERTChaplainEVA parent: ERTChaplain components: - - type: GhostRole - name: ghost-role-information-ert-chaplain-name - description: ghost-role-information-ert-chaplain-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTChaplain - type: Loadout prototypes: [ ERTChaplainGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] - - type: BibleUser + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## ERT Janitor @@ -235,11 +201,6 @@ - type: Sprite sprite: Markers/jobs.rsi state: ertjanitor - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirst - - NamesMilitaryLast - nameFormat: name-format-ert - type: RandomHumanoidSpawner settings: ERTJanitor @@ -256,18 +217,16 @@ job: ERTJanitor - type: RandomMetadata nameSegments: - - NamesMilitaryFirst - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-specialist - type: Loadout prototypes: [ ERTJanitorGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity id: RandomHumanoidSpawnerERTJanitorEVA parent: RandomHumanoidSpawnerERTJanitor - name: ERT janitor - suffix: ERTRole, Enviro EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi @@ -279,16 +238,9 @@ id: ERTJanitorEVA parent: ERTJanitor components: - - type: GhostRole - name: ghost-role-information-ert-janitor-name - description: ghost-role-information-ert-janitor-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTJanitor - type: Loadout prototypes: [ ERTJanitorGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## ERT Engineer @@ -301,11 +253,6 @@ - type: Sprite sprite: Markers/jobs.rsi state: ertengineer - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirst - - NamesMilitaryLast - nameFormat: name-format-ert - type: RandomHumanoidSpawner settings: ERTEngineer @@ -322,18 +269,16 @@ job: ERTEngineer - type: RandomMetadata nameSegments: - - NamesMilitaryFirst - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-specialist - type: Loadout prototypes: [ ERTEngineerGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity id: RandomHumanoidSpawnerERTEngineerEVA parent: RandomHumanoidSpawnerERTEngineer - name: ERT engineer - suffix: ERTRole, Enviro EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi @@ -345,16 +290,29 @@ id: ERTEngineerEVA parent: ERTEngineer components: - - type: GhostRole - name: ghost-role-information-ert-engineer-name - description: ghost-role-information-ert-engineer-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTEngineer - type: Loadout prototypes: [ ERTEngineerGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] + +- type: entity + parent: RandomHumanoidSpawnerERTEngineerEVA + id: RandomHumanoidSpawnerERTEngineerArmed + suffix: ERTRole, Armed, EVA + components: + - type: RandomHumanoidSpawner + settings: ERTEngineerArmed + +- type: randomHumanoidSettings + id: ERTEngineerArmed + parent: ERTEngineer + components: + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-pointman + - type: Loadout + prototypes: [ ERTEngineerGearArmed ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## ERT Security @@ -367,11 +325,6 @@ - type: Sprite sprite: Markers/jobs.rsi state: ertsecurity - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirst - - NamesMilitaryLast - nameFormat: name-format-ert - type: RandomHumanoidSpawner settings: ERTSecurity @@ -388,18 +341,17 @@ job: ERTSecurity - type: RandomMetadata nameSegments: - - NamesMilitaryFirst - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-officer - type: Loadout prototypes: [ ERTSecurityGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity id: RandomHumanoidSpawnerERTSecurityEVA parent: RandomHumanoidSpawnerERTSecurity name: ERT security - suffix: ERTRole, Armored EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi @@ -420,30 +372,91 @@ job: ERTSecurity - type: Loadout prototypes: [ ERTSecurityGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity - id: RandomHumanoidSpawnerERTSecurityEVALecter + id: RandomHumanoidSpawnerERTSecurityArmedRifle parent: RandomHumanoidSpawnerERTSecurityEVA - suffix: ERTRole, Lecter, EVA + name: ERT security rifleman + suffix: ERTRole, Armed, EVA components: - - type: RandomHumanoidSpawner - settings: ERTSecurityEVALecter + - type: RandomHumanoidSpawner + settings: ERTSecurityArmedRifle - type: randomHumanoidSettings - id: ERTSecurityEVALecter + id: ERTSecurityArmedRifle parent: ERTSecurityEVA components: - - type: GhostRole - name: ghost-role-information-ert-security-name - description: ghost-role-information-ert-security-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTSecurity - - type: Loadout - prototypes: [ ERTSecurityGearEVALecter ] - roleLoadout: [ RoleSurvivalEVA ] + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-rifle + - type: Loadout + prototypes: [ ERTSecurityGearArmedRifle ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] + +- type: entity + parent: RandomHumanoidSpawnerERTSecurityEVA + id: RandomHumanoidSpawnerERTSecurityArmedGrenade + name: ERT security grenadier + suffix: ERTRole, Armed, EVA + components: + - type: RandomHumanoidSpawner + settings: ERTSecurityArmedGrenade + +- type: randomHumanoidSettings + parent: ERTSecurityEVA + id: ERTSecurityArmedGrenade + components: + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-grenade + - type: Loadout + prototypes: [ ERTSecurityGearArmedGrenade ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] + +- type: entity + parent: RandomHumanoidSpawnerERTSecurityEVA + id: RandomHumanoidSpawnerERTSecurityArmedVanguard + name: ERT security vanguard + suffix: ERTRole, Armed, EVA + components: + - type: RandomHumanoidSpawner + settings: ERTSecurityArmedVanguard + +- type: randomHumanoidSettings + parent: ERTSecurityEVA + id: ERTSecurityArmedVanguard + components: + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-vanguard + - type: Loadout + prototypes: [ ERTSecurityGearArmedVanguard ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] + +- type: entity + parent: RandomHumanoidSpawnerERTSecurityEVA + id: RandomHumanoidSpawnerERTSecurityArmedShotgun + name: ERT security breacher + suffix: ERTRole, Armed, EVA + components: + - type: RandomHumanoidSpawner + settings: ERTSecurityArmedShotgun + +- type: randomHumanoidSettings + parent: ERTSecurityEVA + id: ERTSecurityArmedShotgun + components: + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-pointman + - type: Loadout + prototypes: [ ERTSecurityGearArmedShotgun ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## ERT Medic @@ -456,11 +469,6 @@ - type: Sprite sprite: Markers/jobs.rsi state: ertmedical - - type: RandomMetadata - nameSegments: - - NamesMilitaryFirst - - NamesMilitaryLast - nameFormat: name-format-ert - type: RandomHumanoidSpawner settings: ERTMedical @@ -477,18 +485,16 @@ job: ERTMedical - type: RandomMetadata nameSegments: - - NamesMilitaryFirst - NamesMilitaryLast - nameFormat: name-format-ert + nameFormat: name-format-ert-doctor - type: Loadout prototypes: [ ERTMedicalGear ] - roleLoadout: [ RoleSurvivalExtended ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] - type: entity id: RandomHumanoidSpawnerERTMedicalEVA parent: RandomHumanoidSpawnerERTMedical - name: ERT medic - suffix: ERTRole, Armored EVA + suffix: ERTRole, EVA components: - type: Sprite sprite: Markers/jobs.rsi @@ -500,16 +506,29 @@ id: ERTMedicalEVA parent: ERTMedical components: - - type: GhostRole - name: ghost-role-information-ert-medical-name - description: ghost-role-information-ert-medical-description - rules: ghost-role-information-nonantagonist-rules - raffle: - settings: short - job: ERTMedical - type: Loadout prototypes: [ ERTMedicalGearEVA ] - roleLoadout: [ RoleSurvivalEVA ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] + +- type: entity + parent: RandomHumanoidSpawnerERTMedicalEVA + id: RandomHumanoidSpawnerERTMedicalArmed + suffix: ERTRole, Armed, EVA + components: + - type: RandomHumanoidSpawner + settings: ERTMedicalArmed + +- type: randomHumanoidSettings + parent: ERTMedicalEVA + id: ERTMedicalArmed + components: + - type: RandomMetadata + nameSegments: + - NamesMilitaryLast + nameFormat: name-format-ert-corpsman + - type: Loadout + prototypes: [ ERTMedicalGearArmed ] + roleLoadout: [ RoleSurvivalMilitaryDouble ] ## CBURN diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 7dc4e4b024..43ad53495f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -91,7 +91,6 @@ - type: entity parent: Jug id: JugPunctTranex - categories: [ HideSpawnMenu ] suffix: punct & tranex components: - type: Label diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index c78463b1e1..e0aa56d79e 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -18,78 +18,76 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTLeaderGearEVA id: ERTLeaderGear equipment: - jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeader - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackFilled head: ClothingHeadHelmetERTLeader - eyes: ClothingEyesGlassesSecurity - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTLeaderPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984 + outerClothing: ClothingOuterArmorBasic pocket2: FlashlightSeclite - storage: - back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - - BoxZiptie - - CrowbarRed - - MagazineMagnum - type: startingGear id: ERTLeaderGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeader - shoes: ClothingShoesBootsMagAdv + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingEyesHudMedSec + neck: Whistle gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984 - pocket2: FlashlightSeclite + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife + suitstorage: WeaponDisablerSMG storage: back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - - BoxZiptie + - Binoculars + - HoloprojectorField + - PhoneInstrument + - PinpointerNuclear + - PowerCellHigh + - PowerCellHigh + - MedkitCombatFilled # End of first line + - MedkitCombatFilled + - TelescopicShield + belt: + - Stunbaton + - Handcuffs + - Handcuffs - CrowbarRed + - WeaponPistolN1984 - MagazineMagnum + - EmergencyMedipen - type: startingGear - id: ERTLeaderGearEVALecter + parent: ERTLeaderGearEVA + id: ERTLeaderGearArmed equipment: - jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeader - shoes: ClothingShoesBootsMagAdv - mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitERTLeader - id: ERTLeaderPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: MagazineRifle - pocket2: MagazineRifle - inhand: - - WeaponRifleLecterXL8 + pocket2: WeaponDisabler + suitstorage: WeaponRifleLecterXL8 storage: back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - - BoxZiptie + - HoloprojectorField + - PhoneInstrument + - PinpointerNuclear + - MagazineRifle + - MagazineRifle + - MagazineRifleIncendiary + - MagazineRifleUranium + - MedkitCombatFilled # End of first line + - GrenadeShrapnel + - EmpGrenade + belt: + - Truncheon + - Handcuffs + - Handcuffs - CrowbarRed + - WeaponPistolN1984 - MagazineMagnum + - EmergencyMedipen - type: chameleonOutfit id: ERTLeaderChameleonOutfit @@ -122,66 +120,49 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTChaplainGearEVA id: ERTChaplainGear equipment: - jumpsuit: ClothingUniformJumpsuitERTChaplain - back: ClothingBackpackERTChaplain - shoes: ClothingShoesLeather + shoes: ClothingShoesBootsJackFilled head: ClothingHeadHatFez - eyes: ClothingEyesGlasses neck: ClothingNeckStoleChaplain - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTChaplainPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltStorageWaistbag - pocket1: Flare - pocket2: DrinkWaterBottleFull - storage: - back: - - BoxCandle - - BoxBodyBag - - DrinkWaterMelonJuiceJug - - Lantern - - Lantern - - Bible - - CrowbarRed - - FoodBakedBunHotX - - FoodBakedBunHotX - - FoodBakedBunHotX - - FoodBakedBunHotX - - Lighter + outerClothing: ClothingOuterArmorBasic + pocket2: FlashlightSeclite - type: startingGear id: ERTChaplainGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTChaplain back: ClothingBackpackERTChaplain - shoes: ClothingShoesBootsMagAdv + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - eyes: ClothingEyesGlasses - neck: ClothingNeckStoleChaplain + eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTChaplain id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltStorageWaistbag - pocket1: Flare - pocket2: DrinkWaterBottleFull + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife storage: back: - BoxCandle - - BoxBodyBag - - DrinkWaterMelonJuiceJug - - Lantern - - Lantern - - Bible - - CrowbarRed + - BodyBagFolded + - BodyBagFolded + - JugWater + - JugBlood # End of first row - FoodBakedBunHotX - FoodBakedBunHotX - FoodBakedBunHotX - FoodBakedBunHotX - - Lighter + belt: + - Bible + - Lantern + - Lantern + - Lantern + - CrowbarRed + - WeaponPistolMk58 + - MagazinePistol + - FlippoEngravedLighter - type: chameleonOutfit id: ERTChaplainChameleonOutfit @@ -213,60 +194,71 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTEngineerGearEVA id: ERTEngineerGear equipment: - jumpsuit: ClothingUniformJumpsuitERTEngineer - back: ClothingBackpackERTEngineer - shoes: ClothingShoesBootsWork + shoes: ClothingShoesBootsJackFilled head: ClothingHeadHelmetERTEngineer - eyes: ClothingEyesGlassesMeson - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTEngineerPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltChiefEngineerFilled - pocket1: Flare - pocket2: GasAnalyzer - storage: - back: - - trayScanner - - RCD - - RCDAmmo - - RCDAmmo - - CableMVStack - - CableHVStack - - CableApcStack - - SheetPlasteel - - SheetSteel - - SheetGlass + outerClothing: ClothingOuterArmorBasic + pocket2: FlashlightSeclite - type: startingGear id: ERTEngineerGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineer - shoes: ClothingShoesBootsMagAdv + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesMeson + eyes: ClothingEyesHudDiagnostic gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTEngineer id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltChiefEngineerFilled - pocket1: Flare - pocket2: GasAnalyzer + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife storage: back: + - RCD + - GasAnalyzer - trayScanner + - HolofanProjector + - PartRodMetal + - SheetPlasteel # End of first line + - MiningDrillDiamond + - RCDAmmo + - RCDAmmo + - RCDAmmo + - RCDAmmo + - MetalFoamGrenade + - AirGrenade + belt: + - JawsOfLife + - PowerDrill + - WelderIndustrialAdvanced + - Multitool + - WeaponPistolMk58 + - MagazinePistol + - EmergencyMedipen + +- type: startingGear + parent: ERTEngineerGearEVA + id: ERTEngineerGearArmed + equipment: + suitstorage: WeaponShotgunEnforcer + storage: + back: - RCD + - GasAnalyzer + - HolofanProjector + - MiningDrillDiamond + - BoxLethalshot + - BoxShotgunSlug # End of first line + - RCDAmmo - RCDAmmo - RCDAmmo - - CableMVStack - - CableHVStack - - CableApcStack - - SheetPlasteel - - SheetSteel - - SheetGlass + - RCDAmmo + - CableDetStack + - BoxDetonator - type: chameleonOutfit id: ERTEngineerChameleonOutfit @@ -296,78 +288,164 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTSecurityGearEVA id: ERTSecurityGear equipment: - jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurity - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackFilled head: ClothingHeadHelmetERTSecurity - eyes: ClothingEyesGlassesSecurity - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTSecurityPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58 + outerClothing: ClothingOuterArmorBasic pocket2: FlashlightSeclite - storage: - back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - - BoxZiptie - - CrowbarRed - - MagazinePistol - type: startingGear id: ERTSecurityGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurity - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingEyesHudSecurity gloves: ClothingHandsGlovesCombat + neck: SecurityWhistle outerClothing: ClothingOuterHardsuitERTSecurity id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58 - pocket2: FlashlightSeclite + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife + suitstorage: WeaponDisablerSMG storage: back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - BoxZiptie + - Flash + - GrenadeFlashBang + - TearGasGrenade + - GrenadeStinger + - MedkitCombatFilled # End of first line + - TelescopicShield + - HoloprojectorSecurity + - PowerCellHigh + belt: + - Stunbaton + - Handcuffs + - Handcuffs - CrowbarRed + - WeaponPistolMk58 - MagazinePistol + - EmergencyMedipen - type: startingGear - id: ERTSecurityGearEVALecter + id: ERTSecurityGearArmedRifle equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurity - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingEyesHudSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: MagazineRifle - pocket2: MagazineRifle + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife + suitstorage: WeaponRifleLecter inhand: - - WeaponRifleLecter + - WeaponLaserCannon + - PortableRecharger + storage: + belt: + - CrowbarRed + - Zipties + - MedkitCombatFilled + - MagazineRifle + - MagazineRifle + - MagazineRifleIncendiary + - MagazineRifleUranium + - Zipties + +- type: startingGear + parent: ERTSecurityGearEVA + id: ERTSecurityGearArmedGrenade + equipment: + pocket2: WeaponDisabler + suitstorage: WeaponLauncherHydraLethal storage: back: - - WeaponDisabler - - MedicatedSuture - - RegenerativeMesh - - BoxZiptie + - GrenadeBlast + - GrenadeBlast + - GrenadeBlast + - GrenadeBlast + - GrenadeBlast + - GrenadeBlast + - MagazinePistol + - MedkitCombatFilled # End of first line + - GrenadeEMP + - GrenadeEMP + - GrenadeEMP + - GrenadeFlash + - GrenadeFlash + - GrenadeFlash + - MagazinePistol + belt: + - Truncheon + - Handcuffs + - Handcuffs - CrowbarRed + - WeaponPistolMk58 - MagazinePistol + - EmergencyMedipen + +- type: startingGear + parent: ERTSecurityGearEVA + id: ERTSecurityGearArmedVanguard + equipment: + pocket2: WeaponDisabler + suitstorage: WeaponSubMachineGunWt550 + storage: + back: + - ExGrenade + - SmokeGrenade + - EmpGrenade + - HoloprojectorSecurity + - TelescopicShield + - TelescopicShield + - TelescopicShield + - MedkitCombatFilled # End of first line + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + belt: + - Truncheon + - Handcuffs + - Handcuffs + - CrowbarRed + - WeaponPistolMk58 + - MagazinePistol + - EmergencyMedipen + +- type: startingGear + parent: ERTSecurityGearEVA + id: ERTSecurityGearArmedShotgun + equipment: + pocket2: WeaponDisabler + suitstorage: WeaponShotgunEnforcer + storage: + back: + - SmokeGrenade + - BoxLethalshot + - BoxShotgunSlug + - BoxShotgunIncendiary + - MedkitCombatFilled # End of first line + - SmokeGrenade + - ExGrenade + - CableDetStack + - BoxDetonator + belt: + - Truncheon + - Handcuffs + - Handcuffs + - CrowbarRed + - WeaponPistolMk58 + - MagazinePistol + - EmergencyMedipen - type: chameleonOutfit id: ERTSecurityChameleonOutfit @@ -397,52 +475,77 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTMedicalGearEVA id: ERTMedicalGear equipment: - jumpsuit: ClothingUniformJumpsuitERTMedic - back: ClothingBackpackERTMedical - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackFilled head: ClothingHeadHelmetERTMedic - eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile - outerClothing: ClothingOuterArmorBasicSlim - id: ERTMedicPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled - pocket1: Flare - storage: - back: - - Hypospray - - MedkitCombatFilled - - MedkitCombatFilled - - CrowbarRed - - ChemistryBottleOmnizine - - ChemistryBottleEpinephrine - - ChemistryBottleEpinephrine + outerClothing: ClothingOuterArmorBasic + pocket2: FlashlightSeclite - type: startingGear id: ERTMedicalGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedical - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTMedical id: ERTMedicPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled - pocket1: Flare + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife storage: back: - Hypospray - - MedkitCombatFilled + - BeakerSmallBruiz + - BeakerSmallLace + - JugPunctTranex + - JugPyraDerma + - JugDexPlusSaline # End of first line + - JugTrico + - BeakerSmallArith + - BeakerSmallDiph + - BeakerSmallSigy + - ClothingEyesGlassesChemical + - ChemistryBottleOmnizine + belt: + - DefibrillatorCompact - MedkitCombatFilled - CrowbarRed + - WeaponPistolMk58 + - MagazinePistol + - EmergencyMedipen + +- type: startingGear + parent: ERTMedicalGearEVA + id: ERTMedicalGearArmed + equipment: + suitstorage: WeaponRifleLecter + pocket2: WeaponDisabler + storage: + back: + - Hypospray + - JugPunctTranex + - JugPyraDerma + - JugDexPlusSaline + - JugTrico # End of first line + - BeakerSmallArith + - DefibrillatorCompact + - MedkitCombatFilled + - ClothingEyesGlassesChemical - ChemistryBottleOmnizine - - ChemistryBottleEpinephrine - - ChemistryBottleEpinephrine + belt: + - Truncheon + - Zipties + - CrowbarRed + - MagazineRifle + - MagazineRifle + - MagazineRifleIncendiary + - MagazineRifleUranium # End of first line + - Zipties - type: chameleonOutfit id: ERTMedicalChameleonOutfit @@ -472,48 +575,51 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear + parent: ERTJanitorGearEVA id: ERTJanitorGear equipment: - jumpsuit: ClothingUniformJumpsuitERTJanitor - back: ClothingBackpackERTJanitor shoes: ClothingShoesGaloshes head: ClothingHeadHelmetERTJanitor - gloves: ClothingHandsGlovesColorPurple - outerClothing: ClothingOuterArmorBasicSlim - id: ERTJanitorPDA - ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled - pocket1: Flare - storage: - back: - - LightReplacer - - BoxLightMixed - - BoxLightMixed - - Soap - - CrowbarRed - - AdvMopItem + outerClothing: ClothingOuterArmorBasic + pocket2: FlashlightSeclite - type: startingGear id: ERTJanitorGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitor - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagERT mask: ClothingMaskGasERT - gloves: ClothingHandsGlovesColorPurple + eyes: ClothingEyesGlassesChemical + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTJanitor id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled - pocket1: Flare + belt: ClothingBeltMilitaryWebbingERT + pocket2: CombatKnife + suitstorage: WeaponLauncherHydra storage: back: + - TrashBag + - SoapNT + - Plunger + - Screwdriver + - AdvMopItem # End of first line + - GrenadeCleanade + - GrenadeCleanade + - GrenadeCleanade + - GrenadeCleanade + - GrenadeCleanade + - GrenadeCleanade + belt: + - MegaSprayBottleSpaceCleaner + - Holoprojector - LightReplacer - - BoxLightMixed - - BoxLightMixed - - Soap + - WireBrush - CrowbarRed - - AdvMopItem + - WeaponPistolMk58 + - MagazinePistol + - EmergencyMedipen - type: chameleonOutfit id: ERTJanitorChameleonOutfit diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplain.png b/Resources/Textures/Markers/jobs.rsi/ertchaplain.png new file mode 100644 index 0000000000..74f47a35a2 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/ertchaplain.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png b/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png new file mode 100644 index 0000000000..3195d44dd2 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index bca3be1df8..ce53eab3eb 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -1,206 +1,212 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", + "size": { "x": 32, "y": 32 - }, - "states": [ - { - "name": "green" }, - { - "name": "ai" - }, - { - "name": "atmospherics" - }, - { - "name": "bartender" - }, - { - "name": "botanist" - }, - { - "name": "boxer" - }, - { - "name": "brigmedic" - }, - { - "name": "captain" - }, - { - "name": "cargo_tech" - }, - { - "name": "cburn" - }, - { - "name": "centcom" - }, - { - "name": "chaplain" - }, - { - "name": "chemist" - }, - { - "name": "ce" - }, - { - "name": "cmo" - }, - { - "name": "clown" - }, - { - "name": "cluwne" - }, - { - "name": "chef" - }, - { - "name": "curator" - }, - { - "name": "cyborg" - }, - { - "name": "detective" - }, - { - "name": "doctor" - }, - { - "name": "ertengineer" - }, - { - "name": "ertengineereva" - }, - { - "name": "ertjanitor" - }, - { - "name": "ertjanitoreva" - }, - { - "name": "ertleader" - }, - { - "name": "ertleadereva" - }, - { - "name": "ertmedical" - }, - { - "name": "ertmedicaleva" - }, - { - "name": "ertsecurity" - }, - { - "name": "ertsecurityeva" - }, - { - "name": "engineer" - }, - { - "name": "geneticist" - }, - { - "name": "hop" - }, - { - "name": "hos" - }, - { - "name": "janitor" - }, - { - "name": "lawyer" - }, - { - "name": "librarian" - }, - { - "name": "medicalintern" - }, - { - "name": "mime" - }, - { - "name": "miner" - }, - { - "name": "musician" - }, - { - "name": "reporter" - }, - { - "name": "paramedic" - }, - { - "name": "passenger" - }, - { - "name": "prisoner" - }, - { - "name": "psychologist" - }, - { - "name": "qm" - }, - { - "name": "rd" - }, - { - "name": "researchassistant" - }, - { - "name": "roboticist" - }, - { - "name": "salvagespecialist" - }, - { - "name": "scientist" - }, - { - "name": "security_cadet" - }, - { - "name": "security_officer" - }, - { - "name": "serviceworker" - }, - { - "name": "seniorengineer" - }, - { - "name": "seniorresearcher" - }, - { - "name": "seniorphysician" - }, - { - "name": "seniorofficer" - }, - { - "name": "technicalassistant" - }, - { - "name": "virologist" - }, - { - "name": "warden" - }, - { - "name": "zookeeper" - } - ] + "states": [ + { + "name": "green" + }, + { + "name": "ai" + }, + { + "name": "atmospherics" + }, + { + "name": "bartender" + }, + { + "name": "botanist" + }, + { + "name": "boxer" + }, + { + "name": "brigmedic" + }, + { + "name": "captain" + }, + { + "name": "cargo_tech" + }, + { + "name": "cburn" + }, + { + "name": "centcom" + }, + { + "name": "chaplain" + }, + { + "name": "chemist" + }, + { + "name": "ce" + }, + { + "name": "cmo" + }, + { + "name": "clown" + }, + { + "name": "cluwne" + }, + { + "name": "chef" + }, + { + "name": "curator" + }, + { + "name": "cyborg" + }, + { + "name": "detective" + }, + { + "name": "doctor" + }, + { + "name": "ertchaplain" + }, + { + "name": "ertchaplaineva" + }, + { + "name": "ertengineer" + }, + { + "name": "ertengineereva" + }, + { + "name": "ertjanitor" + }, + { + "name": "ertjanitoreva" + }, + { + "name": "ertleader" + }, + { + "name": "ertleadereva" + }, + { + "name": "ertmedical" + }, + { + "name": "ertmedicaleva" + }, + { + "name": "ertsecurity" + }, + { + "name": "ertsecurityeva" + }, + { + "name": "engineer" + }, + { + "name": "geneticist" + }, + { + "name": "hop" + }, + { + "name": "hos" + }, + { + "name": "janitor" + }, + { + "name": "lawyer" + }, + { + "name": "librarian" + }, + { + "name": "medicalintern" + }, + { + "name": "mime" + }, + { + "name": "miner" + }, + { + "name": "musician" + }, + { + "name": "reporter" + }, + { + "name": "paramedic" + }, + { + "name": "passenger" + }, + { + "name": "prisoner" + }, + { + "name": "psychologist" + }, + { + "name": "qm" + }, + { + "name": "rd" + }, + { + "name": "researchassistant" + }, + { + "name": "roboticist" + }, + { + "name": "salvagespecialist" + }, + { + "name": "scientist" + }, + { + "name": "security_cadet" + }, + { + "name": "security_officer" + }, + { + "name": "serviceworker" + }, + { + "name": "seniorengineer" + }, + { + "name": "seniorresearcher" + }, + { + "name": "seniorphysician" + }, + { + "name": "seniorofficer" + }, + { + "name": "technicalassistant" + }, + { + "name": "virologist" + }, + { + "name": "warden" + }, + { + "name": "zookeeper" + } + ] }