Пуп

Corvax-Frontier · Apr 18, 2024 · 46bb574 · 46bb574
1 parent 13aae2d
commit 46bb574
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -27,4 +27,6 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
+<<<<<<< HEAD
           availableJobs: {}
+=======