From 46bb5743a4e91788efb72eb4d1c8579aa636e4f6 Mon Sep 17 00:00:00 2001 From: Zekins3366 Date: Thu, 18 Apr 2024 19:04:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Roles/Jobs/departments.yml | 1 - Resources/Prototypes/_NF/Shipyard/canister.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 134ea0aa512..f2516d66208 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -91,7 +91,6 @@ - SecurityCadet # Frontier - No Longer Usable - SecurityOfficer # Frontier - No Longer Usable - Warden # Frontier - No Longer Usable - - SeniorOfficer # Corvax-Frontier - PrisonGuard ##nyano - Prisoner ##nyano - Brigmedic # Frontier diff --git a/Resources/Prototypes/_NF/Shipyard/canister.yml b/Resources/Prototypes/_NF/Shipyard/canister.yml index 54834af7380..c8d68b2403b 100644 --- a/Resources/Prototypes/_NF/Shipyard/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/canister.yml @@ -27,4 +27,6 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] +<<<<<<< HEAD availableJobs: {} +=======