From a259de85b054a49f99642b07721ab43b8f677631 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Tue, 11 Jun 2024 08:34:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Wildcards/psychologist.yml | 3 +- .../Fills/Backpacks/StarterGear/backpack.yml | 29 ------------------- .../Fills/Backpacks/StarterGear/duffelbag.yml | 28 ------------------ .../Fills/Backpacks/StarterGear/satchel.yml | 28 ------------------ .../Loadouts/Jobs/Security/brigmedic.yml | 6 ++-- .../Loadouts/Jobs/Wildcards/psychologist.yml | 6 ++-- .../_Sunrise/Roles/Jobs/Law/Magistrat.yml | 5 +++- .../Roles/Jobs/Security/brigmedic.yml | 4 +++ 8 files changed, 16 insertions(+), 93 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 17bed0ee7f6..eb99ae8d9b7 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -21,4 +21,5 @@ ears: ClothingHeadsetMedical storage: back: - - BoxSurvivalMedical \ No newline at end of file + - BoxSurvivalMedical + - RubberStampPsychologist diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml index dbaec6cd74e..16e93cccc68 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -1,32 +1,3 @@ -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - -- type: entity - noSpawn: true - parent: ClothingBackpackBrigmedic - id: ClothingBackpackBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash - - type: entity noSpawn: true parent: ClothingBackpackSyndie diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index df50eba9d92..e69de29bb2d 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -1,28 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml index e61cf3e33e0..e69de29bb2d 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -1,28 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml index 2ce72db55ab..d719b3f0bf5 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml @@ -5,7 +5,7 @@ - type: startingGear id: BrigmedicBackpack equipment: - back: ClothingBackpackBrigmedicFilled + back: ClothingBackpackBrigmedic - type: loadout id: BrigmedicDuffel @@ -14,7 +14,7 @@ - type: startingGear id: BrigmedicDuffel equipment: - back: ClothingBackpackDuffelBrigmedicFilled + back: ClothingBackpackDuffelBrigmedic - type: loadout id: BrigmedicSatchel @@ -23,7 +23,7 @@ - type: startingGear id: BrigmedicSatchel equipment: - back: ClothingBackpackSatchelBrigmedicFilled + back: ClothingBackpackSatchelBrigmedic - type: loadout id: BrigmedicJumpsuit diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml index 22b4c6a580f..167b43b7442 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml @@ -6,7 +6,7 @@ - type: startingGear id: PsychologistBackpack equipment: - back: ClothingBackpackPsychologistFilled + back: ClothingBackpackPsychologist - type: loadout id: PsychologistSatchel @@ -15,7 +15,7 @@ - type: startingGear id: PsychologistSatchel equipment: - back: ClothingBackpackSatchelPsychologistFilled + back: ClothingBackpackSatchelPsychologist - type: loadout id: PsychologistDuffel @@ -24,4 +24,4 @@ - type: startingGear id: PsychologistDuffel equipment: - back: ClothingBackpackDuffelPsychologistFilled + back: ClothingBackpackDuffelPsychologist diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml index 0037f2cbc18..74c24263c7c 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml @@ -43,7 +43,7 @@ id: MagistratGear equipment: jumpsuit: MagistratUniformSuit - back: ClothingBackpackIAAFilled + back: ClothingBackpack shoes: ClothingShoesBootsLaceup eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorWhite @@ -53,3 +53,6 @@ head: ClothingHeadHatPwig pocket1: Flash pocket2: ClothingNeckLawyerbadge + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml index 94cf662c2f5..9530c1feea5 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml @@ -36,3 +36,7 @@ ears: ClothingHeadsetBrigmedic mask: ClothingMaskSterile belt: ClothingBeltMedicalFilled + storage: + back: + - BoxSurvivalBrigmedic + - Flash