diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index cd269d83ddb..4d5dc848657 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -238,85 +238,298 @@ - id: BoxForensicPad # ERT +# Amber ERT: - type: entity noSpawn: true parent: ClothingBackpackERTLeader - id: ClothingBackpackERTLeaderFilled + id: ClothingBackpackERTLeaderAmber components: - type: StorageFill contents: - - id: BoxSurvivalEngineering - - id: WeaponDisabler - - id: MedicatedSuture - - id: RegenerativeMesh - - id: BoxZiptie + - id: BoxSurvival + - id: WeaponEnergyGun + - id: Stunbaton + - id: Handcuffs + - id: PinpointerNuclear - id: CrowbarRed - - id: MagazineMagnum + - id: MindShieldImplanter + - id: MindShieldImplanter + - id: MindShieldImplanter - type: entity noSpawn: true parent: ClothingBackpackERTSecurity - id: ClothingBackpackERTSecurityFilled + id: ClothingBackpackERTSecurityAmber components: - type: StorageFill contents: - - id: BoxSurvivalEngineering - - id: WeaponDisabler - - id: MedicatedSuture - - id: RegenerativeMesh - - id: BoxZiptie + - id: BoxSurvival + - id: WeaponEnergyGun + - id: FlashlightSeclite + - id: BoxFlashbang + - id: BoxHandcuff - id: CrowbarRed - - id: MagazinePistol - type: entity noSpawn: true parent: ClothingBackpackERTMedical - id: ClothingBackpackERTMedicalFilled + id: ClothingBackpackERTMedicalAmber components: - type: StorageFill contents: - id: BoxSurvivalMedical + - id: WeaponEnergyGunMini - id: Hypospray + - id: MedkitFilled - id: MedkitAdvancedFilled - id: CrowbarRed - - id: OmnizineChemistryBottle - - id: EpinephrineChemistryBottle - - id: EpinephrineChemistryBottle + - id: Stunbaton + - id: Portafib + - id: CombatMedipen - type: entity noSpawn: true parent: ClothingBackpackERTEngineer - id: ClothingBackpackERTEngineerFilled + id: ClothingBackpackERTEngineerAmber components: - type: StorageFill contents: - id: BoxSurvivalEngineering - id: trayScanner - - id: RCD - - id: RCDAmmo - amount: 2 - - id: CableMVStack - - id: CableHVStack - - id: CableApcStack - - id: SheetPlasteel + - id: WeaponEnergyGunMini - id: SheetSteel - id: SheetGlass + - id: FlashlightLantern + - id: GasAnalyzer + - id: Stunbaton + - id: CableMVStack + - id: CableHVStack + - type: entity noSpawn: true parent: ClothingBackpackERTJanitor - id: ClothingBackpackERTJanitorFilled + id: ClothingBackpackERTJanitorAmber components: - type: StorageFill contents: + - id: BoxSurvival + - id: WeaponDisabler + - id: BoxLightMixed + - id: LightReplacer + - id: Soap + - id: CrowbarRed + - id: AdvMopItem + - id: Stunbaton + - id: BoxMousetrap + +# End of Amber +# Red ERT + +- type: entity + noSpawn: true + parent: ClothingBackpackERTLeader + id: ClothingBackpackERTLeaderRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGunPistol + - id: Handcuffs + - id: PinpointerNuclear + - id: DoorRemoteAll + - id: BoxSurvival + - id: CrowbarRed + - id: MindShieldImplanter + - id: MindShieldImplanter + - id: MindShieldImplanter + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackERTSecurity + id: ClothingBackpackERTSecurityRed + components: + - type: StorageFill + contents: + - id: WeaponEnergyGunPistol + - id: WeaponGunLaserCarbineAutomatic + - id: Flash + - id: CombatKnife + - id: BoxHandcuff + - id: BoxSurvivalSecurity + - id: FlashlightSeclite + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackERTMedical + id: ClothingBackpackERTMedicalRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGun + - id: Hypospray + - id: Portafib #make advanced compact + - id: CombatMedipen + - id: CombatMedipen + - id: CombatMedipen + - id: CrowbarRed + - id: BoxSurvivalMedical + - id: RollerBedSpawnFolded + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackERTEngineer + id: ClothingBackpackERTEngineerRed + components: + - type: StorageFill + contents: + - id: Stunbaton - id: BoxSurvivalEngineering + - id: trayScanner + - id: RCD + - id: RCDAmmo + - id: RCDAmmo + - id: RCDAmmo + - id: WeaponEnergyGun + - id: CableHVStack + - id: CableMVStack + - id: FlashlightLantern + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackERTJanitor + id: ClothingBackpackERTJanitorRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGunMini + - id: HydroponicsToolScythe + - id: AdvMopItem - id: LightReplacer - id: BoxLightMixed - - id: BoxLightMixed - - id: Soap + - id: BoxSurvival - id: CrowbarRed + - id: SoapOmega + - id: CombatKnife + - id: DeathAcidifierImplanter + +# End of Red +# Gamma ERT + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTLeaderGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGunPistol + - id: Flash + - id: Handcuffs + - id: PinpointerNuclear + - id: DoorRemoteAll + - id: BoxSurvival + - id: CrowbarRed + - id: MindShieldImplanter + amount: 3 + - id: WeaponPistolUniversal + - id: MagazineUniversalMagnum + amount: 2 + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTSecurityGamma + components: + - type: StorageFill + contents: + - id: WeaponAdvancedLaser + - id: WeaponSniperHristov + - id: MagazineBoxAntiMaterielBig + - id: WeaponGunLaserCarbineAutomatic + - id: WeaponXrayCannon + - id: WeaponEnergyGunPistol + - id: Stunbaton + - id: Bola + - id: BoxHandcuff + - id: BoxFlashbang + - id: C4 + - id: C4 + - id: C4 + - id: BoxSurvivalSecurity + - id: SecBreachingHammer + - id: FlashlightSeclite + - id: CrowbarRed + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTMedicalGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGunPistol + - id: Stimpack + - id: Stimpack + - id: Stimpack + - id: Hypospray + - id: OmnizineChemistryBottle + - id: OmnizineChemistryBottle + - id: OmnizineChemistryBottle + - id: Portafib #make advanced + - id: MedkitFilled + - id: MedkitAdvancedFilled + - id: RollerBedSpawnFolded + - id: CrowbarRed + - id: BoxSurvivalMedical + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTEngineerGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGunPistol + - id: trayScanner + - id: MedicatedSuture + - id: RCDExperimental + - id: BoxSurvivalEngineering + - id: CableHVStack + - id: CableMVStack + - id: DeathAcidifierImplanter + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTJanitorGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponEnergyGun + - id: HydroponicsToolScythe + - id: LightReplacer - id: AdvMopItem + - id: BoxLightMixed + - id: BoxSurvival + - id: CrowbarRed + - id: DeathAcidifierImplanter + + #End of Gamma # Death Squad diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 976d2a4307f..cf8375bd494 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -185,3 +185,16 @@ contents: - id: FoodShakerSalt - id: FoodShakerPepper + +- type: entity + id: ClothingBeltJanitorAdvanced + parent: ClothingBeltJanitor + suffix: Filled + components: + - type: StorageFill + contents: + - id: Soap + - id: SprayBottleSpaceCleaner + - id: WetFloorSign + - id: Holoprojector + - id: FlashlightLantern \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index ef15346a04d..ed12daa57ae 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -39,23 +39,24 @@ ## ERT Leader - type: entity - id: RandomHumanoidSpawnerERTLeader - name: ERT leader - suffix: ERTRole, Basic + id: RandomHumanoidSpawnerERTLeaderAmber + name: Amber ERT leader + suffix: Amber components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertleader - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader - - NamesLastMilitary + - names_last - type: RandomHumanoidSpawner - settings: ERTLeader + settings: ERTLeaderAmber - type: InitialInfectedExempt - type: randomHumanoidSettings - id: ERTLeader + id: ERTLeaderAmber randomizeName: false components: - type: MindShield @@ -64,82 +65,83 @@ description: ghost-role-information-ert-leader-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTLeaderGear ] + prototypes: [ERTLeaderGearAmber] - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader - - NamesLastMilitary + - names_last - type: InitialInfectedExempt - type: entity - id: RandomHumanoidSpawnerERTLeaderEVA - parent: RandomHumanoidSpawnerERTLeader - name: ERT leader - suffix: ERTRole, Armored EVA + id: RandomHumanoidSpawnerERTLeaderRed + parent: RandomHumanoidSpawnerERTLeaderAmber + name: Red ERT leader + suffix: Red components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertleadereva - type: RandomHumanoidSpawner - settings: ERTLeaderEVA - - type: InitialInfectedExempt + settings: ERTLeaderRed - type: randomHumanoidSettings - id: ERTLeaderEVA - parent: ERTLeader + id: ERTLeaderRed + parent: ERTLeaderAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTLeaderGearEVA ] - - type: InitialInfectedExempt + prototypes: [ERTLeaderGearRed] - type: entity - id: RandomHumanoidSpawnerERTLeaderEVALecter - parent: RandomHumanoidSpawnerERTLeaderEVA - suffix: ERTRole, Lecter, EVA + id: RandomHumanoidSpawnerERTLeaderGamma + parent: RandomHumanoidSpawnerERTLeaderAmber + name: Gamma ERT leader + suffix: Gamma components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertleadereva - type: RandomHumanoidSpawner - settings: ERTLeaderEVALecter - - type: InitialInfectedExempt + settings: ERTLeaderGamma - type: randomHumanoidSettings - id: ERTLeaderEVALecter - parent: ERTLeaderEVA + id: ERTLeaderGamma + parent: ERTLeaderAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTLeaderGearEVALecter ] - - type: InitialInfectedExempt + prototypes: [ERTLeaderGearGamma] ## ERT Janitor - type: entity - id: RandomHumanoidSpawnerERTJanitor - parent: RandomHumanoidSpawnerERTLeader - name: ERT janitor - suffix: ERTRole, Basic + id: RandomHumanoidSpawnerERTJanitorAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT janitor Amber + suffix: Amber components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertjanitor - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: RandomHumanoidSpawner - settings: ERTJanitor + settings: ERTJanitorAmber - type: randomHumanoidSettings - id: ERTJanitor - parent: ERTLeader + id: ERTJanitorAmber + parent: ERTLeaderAmber components: - type: MindShield - type: GhostRole @@ -149,57 +151,80 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: Loadout - prototypes: [ ERTJanitorGear ] - - type: InitialInfectedExempt + prototypes: [ERTJanitorGearAmber] - type: entity - id: RandomHumanoidSpawnerERTJanitorEVA - parent: RandomHumanoidSpawnerERTJanitor - name: ERT janitor - suffix: ERTRole, Enviro EVA + id: RandomHumanoidSpawnerERTJanitorRed + parent: RandomHumanoidSpawnerERTJanitorAmber + name: ERT janitor Red + suffix: Red components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertjanitoreva - type: RandomHumanoidSpawner - settings: ERTJanitorEVA + settings: ERTJanitorRed - type: randomHumanoidSettings - id: ERTJanitorEVA - parent: ERTJanitor + id: ERTJanitorRed + parent: ERTJanitorAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTJanitorGearEVA ] - - type: InitialInfectedExempt + prototypes: [ERTJanitorGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTJanitorGamma + parent: RandomHumanoidSpawnerERTJanitorAmber + name: ERT janitor Gamma + suffix: Gamma + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertjanitoreva + - type: RandomHumanoidSpawner + settings: ERTJanitorGamma + +- type: randomHumanoidSettings + id: ERTJanitorGamma + parent: ERTJanitorAmber + components: + - type: GhostRole + name: ghost-role-information-ert-janitor-name + description: ghost-role-information-ert-janitor-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTJanitorGearGamma] ## ERT Engineer - type: entity - id: RandomHumanoidSpawnerERTEngineer - parent: RandomHumanoidSpawnerERTLeader - name: ERT engineer - suffix: ERTRole, Basic + id: RandomHumanoidSpawnerERTEngineerAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT engineer Amber + suffix: Amber components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertengineer - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: RandomHumanoidSpawner - settings: ERTEngineer + settings: ERTEngineerAmber - type: randomHumanoidSettings - id: ERTEngineer - parent: ERTLeader + id: ERTEngineerAmber + parent: ERTLeaderAmber components: - type: MindShield - type: GhostRole @@ -209,57 +234,80 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: Loadout - prototypes: [ ERTEngineerGear ] - - type: InitialInfectedExempt + prototypes: [ERTEngineerGearAmber] - type: entity - id: RandomHumanoidSpawnerERTEngineerEVA - parent: RandomHumanoidSpawnerERTEngineer - name: ERT engineer - suffix: ERTRole, Enviro EVA + id: RandomHumanoidSpawnerERTEngineerRed + parent: RandomHumanoidSpawnerERTEngineerAmber + name: ERT engineer Red + suffix: Red components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertengineereva - type: RandomHumanoidSpawner - settings: ERTEngineerEVA + settings: ERTEngineerRed - type: randomHumanoidSettings - id: ERTEngineerEVA - parent: ERTEngineer + id: ERTEngineerRed + parent: ERTEngineerAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTEngineerGearEVA ] - - type: InitialInfectedExempt + prototypes: [ERTEngineerGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTEngineerGamma + parent: RandomHumanoidSpawnerERTEngineerAmber + name: ERT engineer Gamma + suffix: Gamma + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertengineereva + - type: RandomHumanoidSpawner + settings: ERTEngineerGamma + +- type: randomHumanoidSettings + id: ERTEngineerGamma + parent: ERTEngineerAmber + components: + - type: GhostRole + name: ghost-role-information-ert-engineer-name + description: ghost-role-information-ert-engineer-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTEngineerGearGamma] ## ERT Security - type: entity - id: RandomHumanoidSpawnerERTSecurity - parent: RandomHumanoidSpawnerERTLeader - name: ERT security - suffix: ERTRole, Basic + id: RandomHumanoidSpawnerERTSecurityAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT security Amber + suffix: Amber components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertsecurity - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: RandomHumanoidSpawner - settings: ERTSecurity + settings: ERTSecurityAmber - type: randomHumanoidSettings - id: ERTSecurity - parent: ERTLeader + id: ERTSecurityAmber + parent: ERTLeaderAmber components: - type: MindShield - type: GhostRole @@ -269,80 +317,82 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: Loadout - prototypes: [ ERTSecurityGear ] - - type: InitialInfectedExempt + prototypes: [ERTSecurityGearAmber] - type: entity - id: RandomHumanoidSpawnerERTSecurityEVA - parent: RandomHumanoidSpawnerERTSecurity - name: ERT security - suffix: ERTRole, Armored EVA + id: RandomHumanoidSpawnerERTSecurityRed + parent: RandomHumanoidSpawnerERTSecurityAmber + name: ERT security Red + suffix: Red components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertsecurityeva - type: RandomHumanoidSpawner - settings: ERTSecurityEVA + settings: ERTSecurityRed - type: randomHumanoidSettings - id: ERTSecurityEVA - parent: ERTSecurity + id: ERTSecurityRed + parent: ERTSecurityAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTSecurityGearEVA ] - - type: InitialInfectedExempt + prototypes: [ERTSecurityGearRed] - type: entity - id: RandomHumanoidSpawnerERTSecurityEVALecter - parent: RandomHumanoidSpawnerERTSecurityEVA - suffix: ERTRole, Lecter, EVA + id: RandomHumanoidSpawnerERTSecurityGamma + parent: RandomHumanoidSpawnerERTSecurityAmber + name: ERT security Gamma + suffix: Gamma components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertsecurityeva - type: RandomHumanoidSpawner - settings: ERTSecurityEVALecter + settings: ERTSecurityGamma - type: randomHumanoidSettings - id: ERTSecurityEVALecter - parent: ERTSecurityEVA + id: ERTSecurityGamma + parent: ERTSecurityAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTSecurityGearEVALecter ] - - type: InitialInfectedExempt + prototypes: [ERTSecurityGearGamma] ## ERT Medic - type: entity - id: RandomHumanoidSpawnerERTMedical - parent: RandomHumanoidSpawnerERTLeader - name: ERT medic - suffix: ERTRole, Basic + id: RandomHumanoidSpawnerERTMedicalAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT medic Amber + suffix: Amber components: + - type: MindShield - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertmedical - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: RandomHumanoidSpawner - settings: ERTMedical + settings: ERTMedicalAmber - type: randomHumanoidSettings - id: ERTMedical - parent: ERTLeader + id: ERTMedicalAmber + parent: ERTLeaderAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description @@ -350,35 +400,57 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitary - - NamesLastMilitary + - names_last - type: Loadout - prototypes: [ ERTMedicalGear ] - - type: InitialInfectedExempt + prototypes: [ERTMedicalGearAmber] - type: entity - id: RandomHumanoidSpawnerERTMedicalEVA - parent: RandomHumanoidSpawnerERTMedical - name: ERT medic - suffix: ERTRole, Armored EVA + id: RandomHumanoidSpawnerERTMedicalRed + parent: RandomHumanoidSpawnerERTMedicalAmber + name: ERT medic Red + suffix: Red components: - type: Sprite + netsync: false sprite: Markers/jobs.rsi state: ertmedicaleva - type: RandomHumanoidSpawner - settings: ERTMedicalEVA + settings: ERTMedicalRed - type: randomHumanoidSettings - id: ERTMedicalEVA - parent: ERTMedical + id: ERTMedicalRed + parent: ERTMedicalAmber components: - - type: MindShield - type: GhostRole name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTMedicalGearEVA ] - - type: InitialInfectedExempt + prototypes: [ERTMedicalGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTMedicalGamma + parent: RandomHumanoidSpawnerERTMedicalAmber + name: ERT medic Gamma + suffix: Gamma + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertmedicaleva + - type: RandomHumanoidSpawner + settings: ERTMedicalGamma + +- type: randomHumanoidSettings + id: ERTMedicalGamma + parent: ERTMedicalAmber + components: + - type: GhostRole + name: ghost-role-information-ert-medical-name + description: ghost-role-information-ert-medical-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTMedicalGearGamma] ## CBURN diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml index a2419101c65..9f9ca3b22f9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -163,7 +163,7 @@ - type: entity parent: DoorRemoteDefault id: DoorRemoteAll - name: super door remote + name: omni door remote suffix: Admeme components: - type: Sprite diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index d54baba3dbd..67e975662d3 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -1,70 +1,62 @@ -# Leader - type: job id: ERTLeader name: job-name-ertleader description: job-description-ertleader playTimeTracker: JobERTLeader setPreference: false - startingGear: ERTLeaderGearEVA + startingGear: ERTLeaderGearAmber icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: - - CentralCommand - type: startingGear - id: ERTLeaderGear + id: ERTLeaderGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeaderFilled + back: ClothingBackpackERTLeaderAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTLeader eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim + outerClothing: ClothingOuterArmorDuraVest id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984Nonlethal - pocket2: FlashlightSeclite + belt: ClothingBeltSheathFilled + pocket1: Flare - type: startingGear - id: ERTLeaderGearEVA + id: ERTLeaderGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeaderFilled - shoes: ClothingShoesBootsMagAdv + back: ClothingBackpackERTLeaderRed + shoes: ClothingShoesBootsMag mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader - suitstorage: AirTankFilled + suitstorage: OxygenTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984Nonlethal - pocket2: FlashlightSeclite + belt: ClothingBeltSheathFilled + pocket1: Flare - type: startingGear - id: ERTLeaderGearEVALecter + id: ERTLeaderGearGamma equipment: jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeaderFilled + back: ClothingBackpackERTLeaderGamma shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitERTLeader - suitstorage: WeaponRifleLecter + outerClothing: ClothingOuterHardsuitLeaderElite + suitstorage: OxygenTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: MagazineRifle - pocket2: MagazineRifle - inhand: - - AirTankFilled + belt: ClothingBeltSheathFilled + pocket1: Flare # Engineer - type: job @@ -73,47 +65,60 @@ description: job-description-ertengineer playTimeTracker: JobERTEngineer setPreference: false - startingGear: ERTEngineerGearEVA + startingGear: ERTEngineerGearAmber icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: - - CentralCommand - type: startingGear - id: ERTEngineerGear + id: ERTEngineerGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer - back: ClothingBackpackERTEngineerFilled - shoes: ClothingShoesBootsWork - head: ClothingHeadHelmetERTEngineer + back: ClothingBackpackERTEngineerAmber + shoes: ClothingShoesBootsMag eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTEngineerPDA + outerClothing: ClothingOuterHardsuitERTEngineer + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltUtilityEngineering + pocket1: Flare + +- type: startingGear + id: ERTEngineerGearRed + equipment: + jumpsuit: ClothingUniformJumpsuitERTEngineer + back: ClothingBackpackERTEngineerRed + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesMeson + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTEngineerElite + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled pocket1: Flare - pocket2: GasAnalyzer - type: startingGear - id: ERTEngineerGearEVA + id: ERTEngineerGearGamma equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer - back: ClothingBackpackERTEngineerFilled + back: ClothingBackpackERTEngineerGamma shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitERTEngineer - suitstorage: AirTankFilled - id: ERTEngineerPDA + outerClothing: ClothingOuterHardsuitERTEngineerElite + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled pocket1: Flare - pocket2: GasAnalyzer + + # Security - type: job @@ -122,66 +127,60 @@ description: job-description-ertsecurity playTimeTracker: JobERTSecurity setPreference: false - startingGear: ERTEngineerGearEVA + startingGear: ERTSecurityGearAmber icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: - - CentralCommand - type: startingGear - id: ERTSecurityGear + id: ERTSecurityGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurityFilled + back: ClothingBackpackERTSecurityAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTSecurity eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasicSlim - id: ERTSecurityPDA + outerClothing: ClothingOuterArmorPlateCarrier + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal - pocket2: FlashlightSeclite + pocket1: Flare + - type: startingGear - id: ERTSecurityGearEVA + id: ERTSecurityGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurityFilled + back: ClothingBackpackERTSecurityRed shoes: ClothingShoesBootsMag mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity - suitstorage: AirTankFilled - id: ERTSecurityPDA + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal - pocket2: FlashlightSeclite + pocket1: Flare - type: startingGear - id: ERTSecurityGearEVALecter + id: ERTSecurityGearGamma equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurityFilled - shoes: ClothingShoesBootsMag + back: ClothingBackpackERTSecurityGamma + shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitERTSecurity - suitstorage: WeaponRifleLecter - id: ERTSecurityPDA + outerClothing: ClothingOuterHardsuitERTSecurityElite + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: MagazineRifle - pocket2: MagazineRifle - inhand: - - AirTankFilled + pocket1: Flare # Medical - type: job @@ -190,45 +189,62 @@ description: job-description-ertmedic playTimeTracker: JobERTMedical setPreference: false - startingGear: ERTMedicalGearEVA + startingGear: ERTMedicalGearAmber icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: - - CentralCommand - type: startingGear - id: ERTMedicalGear + id: ERTMedicalGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTMedic - back: ClothingBackpackERTMedicalFilled + back: ClothingBackpackERTMedicalAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTMedic eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile - outerClothing: ClothingOuterArmorBasicSlim - id: ERTMedicPDA + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterArmorDuraVest + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled - pocket1: Flare + pocket1: HandheldHealthAnalyzer + pocket2: Flare - type: startingGear - id: ERTMedicalGearEVA + id: ERTMedicalGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTMedic - back: ClothingBackpackERTMedicalFilled + back: ClothingBackpackERTMedicalRed shoes: ClothingShoesBootsMag mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTMedical - suitstorage: AirTankFilled - id: ERTMedicPDA + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled - pocket1: Flare + belt: ClothingBeltCorpsmanWebbingFilled + pocket1: HandheldHealthAnalyzer + pocket2: Flare + +- type: startingGear + id: ERTMedicalGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTMedic + back: ClothingBackpackERTMedicalGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskGasERT + eyes: ClothingEyesHudMedical + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTMedicalElite + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltCorpsmanWebbingFilled + pocket1: HandheldHealthAnalyzer + pocket2: Flare # Janitor - type: job @@ -237,40 +253,62 @@ description: job-description-ertjanitor playTimeTracker: JobERTJanitor setPreference: false - startingGear: ERTJanitorGearEVA + startingGear: ERTJanitorGearAmber icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: - - CentralCommand - type: startingGear - id: ERTJanitorGear + id: ERTJanitorGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor - back: ClothingBackpackERTJanitorFilled + back: ClothingBackpackERTJanitorAmber shoes: ClothingShoesGaloshes + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetERTJanitor - gloves: ClothingHandsGlovesColorPurple - outerClothing: ClothingOuterArmorBasicSlim - id: ERTJanitorPDA + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterArmorDuraVest + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled + belt: ClothingBeltJanitorAdvanced pocket1: Flare + inhand: + - TrashBag - type: startingGear - id: ERTJanitorGearEVA + id: ERTJanitorGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor - back: ClothingBackpackERTJanitorFilled - shoes: ClothingShoesBootsMag - mask: ClothingMaskGasERT - gloves: ClothingHandsGlovesColorPurple + back: ClothingBackpackERTJanitorRed + shoes: ClothingShoesGaloshes + mask: ClothingMaskBreath + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTJanitor - suitstorage: AirTankFilled - id: ERTJanitorPDA + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltJanitorAdvanced + pocket1: Flare + inhand: + - TrashBag + +- type: startingGear + id: ERTJanitorGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTJanitor + back: ClothingBackpackERTJanitorGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskBreath + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTJanitorElite + suitstorage: OxygenTankFilled + id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled + belt: ClothingBeltJanitorAdvanced pocket1: Flare + inhand: + - TrashBag \ No newline at end of file