From 786746c5bd7d09abc25be7621fa38d42f137134c Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sat, 23 Apr 2022 17:54:02 -0600 Subject: [PATCH] Minor bug fixes from earlier today merges (#7729) --- .../Prototypes/Catalog/Fills/Lockers/engineer.yml | 1 - .../Prototypes/Entities/Clothing/Head/helmets.yml | 11 +++++++++-- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index bb67bcc15a..bddbba129e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -93,7 +93,6 @@ components: - type: StorageFill contents: - - id: ClothingHeadHelmetHardsuitEngineering - id: ClothingOuterHardsuitEngineering - id: ClothingHandsGlovesColorYellow - id: ClothingMaskGas diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 8e2fb4b6e4..64b75f0a4a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -186,7 +186,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetFire name: fire helmet description: An atmos techs best friend. Provides some heat resistance and looks cool. @@ -195,6 +195,9 @@ sprite: Clothing/Head/Helmets/firehelmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/firehelmet.rsi + size: 5 + canPickup: true + quickEquip: true - type: IngestionBlocker - type: PowerCellSlot cellSlot: @@ -212,9 +215,10 @@ - type: PressureProtection highPressureMultiplier: 0.65 lowPressureMultiplier: 1000 + - type: entity - parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetAtmosFire name: atmos fire helmet description: An atmos fire helmet, able to keep the user cool in any situation. @@ -223,6 +227,9 @@ sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi + size: 5 + canPickup: true + quickEquip: true - type: IngestionBlocker - type: TemperatureProtection coefficient: 0.005 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 71b0ed5d22..951321e90d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -1,6 +1,6 @@ - type: job id: AtmosphericTechnician - name: "Atmospheric Technician" + name: "atmospheric technician" startingGear: AtmosphericTechnicianGear departments: - Engineering