diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index ae3133bde4..fb44ea8459 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -28,16 +28,6 @@ - id: BoxSurvivalSecurity - id: Flash -- type: entity - noSpawn: true - parent: ClothingBackpackBrigmedic - id: ClothingBackpackBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash - - type: entity noSpawn: true parent: ClothingBackpackMedical diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index c22129a29c..7fd3eab110 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -460,8 +460,6 @@ parent: SpawnPointJobBase name: brigmedic components: - - type: SpawnPoint - job_id: Brigmedic - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 2b65784393..ae3c062779 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -159,7 +159,7 @@ - state: idmedicaldoctor - type: PresetIdCard job: MedicalDoctor - + - type: entity parent: IDCardStandard id: ParamedicIDCard @@ -419,8 +419,6 @@ layers: - state: default - state: idbrigmedic - - type: PresetIdCard - job: Brigmedic - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 94e9a1d78c..df25d0475e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -576,8 +576,6 @@ - ClothingUniformJumpskirtScientist - ClothingUniformJumpsuitSec - ClothingUniformJumpskirtSec - - ClothingUniformJumpsuitBrigmedic - - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden - ClothingOuterWinterCap diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 7a07127904..68419c03df 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -48,5 +48,4 @@ Reporter: [ 2, 2 ] Detective: [ 1, 1 ] ResearchAssistant: [ 2, 2 ] - Brigmedic: [ 1, 1 ] Paramedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index 16b7d9a230..5efbd3ade4 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -6,7 +6,7 @@ stations: Boxstation: mapNameTemplate: '{0} Box Station {1}' - emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml + emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml nameGenerator: !type:NanotrasenNameGenerator prefixCreator: 'TG' @@ -46,5 +46,4 @@ SecurityCadet: [ 4, 4 ] Detective: [ 1, 1 ] ResearchAssistant: [ 4, 4 ] - Brigmedic: [ 1, 1 ] Paramedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index a268986438..80072ddb13 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -46,4 +46,3 @@ SecurityCadet: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] Quartermaster: [ 1, 1 ] - Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index f900c4d6ec..1e9a62c301 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -46,5 +46,4 @@ SecurityCadet: [ 2, 2 ] Detective: [ 1, 1 ] ResearchAssistant: [ 3, 3 ] - Brigmedic: [ 1, 1 ] Paramedic: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml index bf348760a7..01f3b0bbc2 100644 --- a/Resources/Prototypes/Maps/kettle.yml +++ b/Resources/Prototypes/Maps/kettle.yml @@ -46,5 +46,4 @@ ServiceWorker: [ 4, 4 ] SecurityCadet: [ 4, 4 ] Detective: [ 1, 1 ] - Brigmedic: [ 1, 1 ] Zookeeper: [1, 1] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 9c4432b3a4..f86a1222bb 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -46,5 +46,4 @@ SecurityCadet: [ 4, 4 ] Detective: [ 1, 1 ] ResearchAssistant: [ 4, 4 ] - Brigmedic: [ 1, 1 ] Paramedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 7951fddaff..111d943135 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -46,6 +46,5 @@ SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] ResearchAssistant: [ 2, 2] - Brigmedic: [ 1, 1] Boxer: [ 1, 1] Paramedic: [ 1, 1] diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 9898142a91..8d7e977efd 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -392,20 +392,6 @@ materials: Cloth: 300 -- type: latheRecipe - id: ClothingUniformJumpsuitBrigmedic - result: ClothingUniformJumpsuitBrigmedic - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtBrigmedic - result: ClothingUniformJumpskirtBrigmedic - completetime: 4 - materials: - Cloth: 300 - - type: latheRecipe id: ClothingUniformJumpsuitWarden result: ClothingUniformJumpsuitWarden diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml deleted file mode 100644 index f8d6395ba0..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ /dev/null @@ -1,40 +0,0 @@ -- type: job - id: Brigmedic - name: job-name-brigmedic - description: job-description-brigmedic - playTimeTracker: JobBrigmedic - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 18000 - - !type:DepartmentTimeRequirement - department: Security - time: 7200 - startingGear: BrigmedicGear - icon: "Brigmedic" - supervisors: job-supervisors-hos - canBeAntag: false - access: - - Medical - - Security - - Brig - - Maintenance - - External - -- type: startingGear - id: BrigmedicGear - equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG - back: ClothingBackpackBrigmedicFilled - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretBrigmedic - id: BrigmedicPDA - ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity - belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtBrigmedic - satchel: ClothingBackpackSatchelBrigmedicFilled - duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 891f6c5195..29ca0c4743 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -79,7 +79,6 @@ - SecurityOfficer - Detective - Warden - - Brigmedic - type: department id: Science diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 87be771f89..6f076c9746 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -64,9 +64,6 @@ - type: playTimeTracker id: JobHeadOfSecurity -- type: playTimeTracker - id: JobBrigmedic - - type: playTimeTracker id: JobJanitor diff --git a/Resources/migration.yml b/Resources/migration.yml index cb543c920d..baa9bd2057 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -9,6 +9,29 @@ chem_dispenser: ChemDispenser +# 2023-05-03 +SpawnPointBrigmedic: null +ClothingHeadsetBrigmedic: null +ClothingHeadHatBeretBrigmedic: null +ClothingHeadHelmetHardsuitBrigmedic: null +ClothingOuterHardsuitBrigmedic: null +ClothingOuterCoatAMG: null +ClothingUniformJumpsuitBrigmedic: null +ClothingUniformJumpskirtBrigmedic: null +ClothingUniformJumpskirtOfLife: null +ClothingBackpackBrigmedic: null +ClothingBackpackBrigmedicFilled: null +ClothingBackpackSatchelBrigmedic: null +ClothingBackpackSatchelBrigmedicFilled: null +ClothingBackpackDuffelBrigmedic: null +ClothingBackpackDuffelBrigmedicFilled: null +BrigmedicIDCard: null +BrigmedicPDA: null +BoxSurvivalBrigmedic: null +LockerBrigmedic: null +LockerBrigmedicFilled: null +BedsheetBrigmedic: null + # 2023-05-04 BoxMagazineMagnumSubMachineGun: BoxMagazinePistolSubMachineGun BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice