Merge branch 'master' of https://github.com/BitBoxxxer/Honk_Grandpa

space-syndicate · Sep 28, 2023 · a93ce3e · a93ce3e
2 parents b6ff9ca + 42e9a21
commit a93ce3e
Show file tree

Hide file tree

Showing 76 changed files with 4,377 additions and 2,103 deletions.
diff --git a/Resources/Locale/ru-RU/_Ck/job/department-desc.ftl b/Resources/Locale/ru-RU/_Ck/job/department-desc.ftl
@@ -1,5 +1,4 @@
 department-IAA-description = Судите виновных, защищайте права разумных существ, следите за состоянием закона на станции.
 department-Cafe-description = На вас держится вся станция, накормите всех посетителей, выполните заказы.
-department-Osobiy-description = Космические пираты, неуловимые бандиты!
 department-Nanotrasen-description = Следите за своим сектором, иначе и вам тоже расторгнут контракт.
 department-Silicon-description = Следуйте правилам киборгов, выполняйте приказы разумных существ, иначе вас разобрут на части.
diff --git a/Resources/Locale/ru-RU/_Ck/job/department.ftl b/Resources/Locale/ru-RU/_Ck/job/department.ftl
@@ -1,4 +1,3 @@
-department-Osobiy = Космические пираты
 department-Cafe = Кафе
 department-IAA = Юридический отдел
 department-Nanotrasen = Станция ЦК

diff --git a/Resources/Locale/ru-RU/_Ck/job/job-description.ftl b/Resources/Locale/ru-RU/_Ck/job/job-description.ftl
@@ -13,7 +13,4 @@ job-description-cleaner = Выполняй приказы
 job-description-assistant = Выполняй приказы
 job-description-medic = Выполняй приказы
 job-description-scrap = Выполняй приказы
-job-description-engineer = Выполняй приказы
-job-description-Pirate = Скорее всего вы откинетесь при первом же абордаже.
-job-description-PirateVeteran = Вы уже не тот абориген.
-job-description-PirateBlackbeard = Легенда космоса, тот чья голова стоит больше сектора!
+job-description-engineer = Выполняй приказы
diff --git a/Resources/Locale/ru-RU/_Ck/job/job-names.ftl b/Resources/Locale/ru-RU/_Ck/job/job-names.ftl
@@ -1,4 +1,4 @@
-job-name-rab = раб
+job-name-rab = заключённый
 job-name-OperativeLeader = лидер оперативников Нанотрайзен
 job-name-OperativeMedic = медик оперативников Нанотрайзен
 job-name-Operative = оперативник Нанотрайзен
@@ -14,19 +14,13 @@ job-name-assistantCK = борг-асистент
 job-name-medicCK = борг-медик
 job-name-scrapCK = борг-утиль
 job-name-engineerCK = борг-инженер
-job-name-Pirate = пират-абориген
-job-name-PirateVeteran = пират-ветеран
-job-name-PirateBlackbeard = Чёрная борода
 
 # Role timers - Make these alphabetical or I cut you
 
 JobChefck = повар
 JobKTKP = пилот
-JobRab = раб
-JobRabMaster = пират-ветеран
+JobPrisoner = заключённый
 JobLox = бомж
-JobPirate1lvl = пират-абориген
-JobPirate3lvl = чёрная борода
 JobERTsec = оперативник Нанотрайзен
 JobERTmedic = медик оперативников Нанотрайзен
 JobERTleader = лидер оперативников Нанотрайзен

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml
@@ -2,7 +2,9 @@
   id: CorvaxDelta
   mapName: 'Delta Station'
   mapPath: /Maps/corvax_delta.yml
-  minPlayers: 40
+  minPlayers: 0
+  maxPlayers: 75
+  fallback: true
   stations:
     Delta:
       stationProto: StandardNanotrasenStation
@@ -21,8 +23,8 @@
             CargoTechnician: [ 4, 4 ]
             Passenger: [ -1, -1 ]
             Bartender: [ 1, 1 ]
-            Botanist: [ 3, 4 ]
-            Chef: [ 1, 2 ]
+            Botanist: [ 2, 4 ]
+            Chef: [ 1, 1 ]
             Clown: [ 1, 1 ]
             Janitor: [ 1, 2 ]
             Mime: [ 1, 1 ]
@@ -58,3 +60,12 @@
             SeniorResearcher: [ 1, 1 ]
             SeniorPhysician: [ 1, 1 ]
             SeniorEngineer: [ 1, 1 ]
+            BORGcleaner: [ 1, 1 ]
+            BORGassist: [ 1, 1 ]
+            BORGmedical: [ 1, 1 ]
+            BORGsalvage: [ 1, 1 ]
+            BORGengineer: [ 1, 1 ]
+            KTKP: [ 1, 1 ]
+            Prisoner: [ 3, 3 ]
+            Chefck: [ 2, 3 ]
+            Lox: [ 2, 3]
diff --git a/Resources/Prototypes/Corvax/Maps/gate.yml b/Resources/Prototypes/Corvax/Maps/gate.yml
@@ -3,6 +3,7 @@
   mapName: 'Gate Station'
   mapPath: /Maps/corvax_gate.yml
   minPlayers: 50
+  maxPlayers: 75
   stations:
     Gate:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Corvax/Maps/ishimura.yml b/Resources/Prototypes/Corvax/Maps/ishimura.yml
@@ -2,7 +2,8 @@
   id: CorvaxIshimura
   mapName: 'USG Ishimura'
   mapPath: /Maps/corvax_ishimura.yml
-  minPlayers: 25
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Ishimura:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Corvax/Maps/spectrum.yml b/Resources/Prototypes/Corvax/Maps/spectrum.yml
@@ -2,7 +2,8 @@
   id: CorvaxSpectrum
   mapName: 'Spectrum Station'
   mapPath: /Maps/corvax_spectrum.yml
-  minPlayers: 40
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Spectrum:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml
@@ -13,4 +13,4 @@
           overflowJobs:
             - Passenger
           availableJobs:
-            Passenger: [ -1, -1 ]
+            SecurityOfficer: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/aspid.yml b/Resources/Prototypes/Maps/aspid.yml
@@ -2,8 +2,8 @@
   id: Aspid
   mapName: 'NCS Aspid'
   mapPath: /Maps/aspid.yml
-  minPlayers: 25
-  maxPlayers: 70
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Aspid:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
@@ -2,8 +2,8 @@
   id: Bagel
   mapName: 'Bagel Station'
   mapPath: /Maps/bagel.yml
-  minPlayers: 40
-  maxPlayers: 76
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Bagel:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml
@@ -2,8 +2,8 @@
   id: Barratry
   mapName: 'Barratry'
   mapPath: /Maps/barratry.yml
-  minPlayers: 30
-  maxPlayers: 60
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Barratry:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
@@ -3,6 +3,7 @@
   mapName: 'Box Station'
   mapPath: /Maps/box.yml
   minPlayers: 50
+  maxPlayers: 75
   stations:
     Boxstation:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/centcomm.yml b/Resources/Prototypes/Maps/centcomm.yml
@@ -2,13 +2,20 @@
   id: CentComm
   mapName: 'Central Command'
   mapPath: /Maps/centcomm.yml
-  minPlayers: 10
+  minPlayers: 1
   stations:
     centcomm:
       stationProto: NanotrasenCentralCommand
       components:
         - type: StationNameSetup
-          mapNameTemplate: '{0} Central Command {1}'
+          mapNameTemplate: '{0} Станция ЦК {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'
+        - type: StationJobs
+          availableJobs:
+            CentralOfficial: [ 1, 1 ]
+            Centralassist: [ 2, 2 ]
+            ERTleader: [ 1, 1 ]
+            ERTmedic: [ 1, 1 ]
+            ERTsec: [ 3, 3 ]
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
@@ -2,8 +2,8 @@
   id: Cluster
   mapName: 'Cluster'
   mapPath: /Maps/cluster.yml
-  minPlayers: 0
-  maxPlayers: 35
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Cluster:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
@@ -2,8 +2,8 @@
   id: Core
   mapName: 'Core'
   mapPath: /Maps/core.yml
-  minPlayers: 30
-  maxPlayers: 60
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Core:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
@@ -2,8 +2,8 @@
   id: Europa
   mapName: 'Europa'
   mapPath: /Maps/europa.yml
-  minPlayers: 0
-  maxPlayers: 40
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Europa:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
@@ -2,7 +2,8 @@
   id: Fland
   mapName: 'Fland Installation'
   mapPath: /Maps/fland.yml
-  minPlayers: 70
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Fland:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml
@@ -2,7 +2,8 @@
   id: Kettle
   mapName: 'Kettle'
   mapPath: /Maps/kettle.yml
-  minPlayers: 35
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Kettle:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
@@ -2,8 +2,8 @@
   id: Marathon
   mapName: 'Marathon Station'
   mapPath: /Maps/marathon.yml
-  minPlayers: 35
-  maxPlayers: 70
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Marathon:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
@@ -3,6 +3,7 @@
   mapName: 'Meta Station'
   mapPath: /Maps/meta.yml
   minPlayers: 50
+  maxPlayers: 75
   stations:
     Meta:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
@@ -2,8 +2,8 @@
   id: Omega
   mapName: 'Omega'
   mapPath: /Maps/omega.yml
-  minPlayers: 0
-  maxPlayers: 35
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Omega:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml
@@ -3,6 +3,7 @@
   mapName: 'Origin'
   mapPath: /Maps/origin.yml
   minPlayers: 50
+  maxPlayers: 75
   stations:
     Origin:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
@@ -2,8 +2,8 @@
   id: Packed
   mapName: 'Packed'
   mapPath: /Maps/packed.yml
-  minPlayers: 5
-  maxPlayers: 40
+  minPlayers: 50
+  maxPlayers: 75
   stations:
     Packed:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
@@ -2,8 +2,8 @@
   id: Saltern
   mapName: 'Saltern'
   mapPath: /Maps/saltern.yml
-  minPlayers: 0
-  maxPlayers: 35
+  minPlayers: 50
+  maxPlayers: 75
   fallback: true
   stations:
     Saltern:

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -38,16 +38,6 @@
   - BORGsalvage
   - BORGengineer
 
-- type: department
-  id: Osobiy
-  description: department-Osobiy-description
-  color: "#791500"
-  roles:
-  - Rab
-  - RabMaster
-  - Pirate1lvl
-  - Pirate3lvl
-
 - type: department
   id: Cafe
   description: department-Cafe-description
@@ -131,6 +121,7 @@
   - Detective
   - Warden
   - KTKP
+  - Prisoner
 
 - type: department
   id: Science

diff --git a/Resources/Prototypes/_Ck/Entities/Clothing/belt/SSSP.yml b/Resources/Prototypes/_Ck/Entities/Clothing/belt/SSSP.yml
@@ -5,6 +5,6 @@
   description: Штурмовая разгрузка СССП
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\belt\SSSP.rsi
+    sprite: _Ck/Entities/clothing/belt/SSSP.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\belt\SSSP.rsi
+    sprite: _Ck/Entities/clothing/belt/SSSP.rsi
diff --git a/Resources/Prototypes/_Ck/Entities/Clothing/glasses/glasses.yml b/Resources/Prototypes/_Ck/Entities/Clothing/glasses/glasses.yml
@@ -5,9 +5,9 @@
   description: ФУУУУУ!!! ОНИ ГРЯЗНЫЕ!!!!!!
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\eyes\glasses\lox.rsi
+    sprite: _Ck/Entities/clothing/eyes/glasses/lox.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\eyes\glasses\lox.rsi
+    sprite: _Ck/Entities/clothing/eyes/glasses/lox.rsi
   - type: MeleeWeapon
     damage:
       types:

diff --git a/Resources/Prototypes/_Ck/Entities/Clothing/gloves/gloves.yml b/Resources/Prototypes/_Ck/Entities/Clothing/gloves/gloves.yml
@@ -5,9 +5,9 @@
   description: 
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\gloves\SSSP_gloves.rsi
+    sprite: _Ck/Entities/clothing/gloves/SSSP_gloves.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\gloves\SSSP_gloves.rsi
+    sprite: _Ck/Entities/clothing/gloves/SSSP_gloves.rsi
   - type: GloveHeatResistance
     heatResistance: 1400
   - type: Insulated

diff --git a/Resources/Prototypes/_Ck/Entities/Clothing/head/SSSPhelmet.yml b/Resources/Prototypes/_Ck/Entities/Clothing/head/SSSPhelmet.yml
@@ -5,9 +5,9 @@
   description: Шапка СССП
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\head\ushankaSSSP.rsi
+    sprite: _Ck/Entities/clothing/head/ushankaSSSP.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\head\ushankaSSSP.rsi
+    sprite: _Ck/Entities/clothing/head/ushankaSSSP.rsi
 
 - type: entity
   parent: ClothingHeadBase
@@ -16,9 +16,9 @@
   description: Каска солдата СССП
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\head\SSSP_helmet.rsi
+    sprite: _Ck/Entities/clothing/head/SSSP_helmet.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\head\SSSP_helmet.rsi
+    sprite: _Ck/Entities/clothing/head/SSSP_helmet.rsi
   - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
     modifiers:
       coefficients:
@@ -38,9 +38,9 @@
   description: Шапка офицера СССП
   components:
   - type: Sprite
-    sprite: _Ck\Entities\clothing\head\sovietcapbel.rsi
+    sprite: _Ck/Entities/clothing/head/sovietcapbel.rsi
   - type: Clothing
-    sprite: _Ck\Entities\clothing\head\sovietcapbel.rsi
+    sprite: _Ck/Entities/clothing/head/sovietcapbel.rsi
   - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
     modifiers:
       coefficients: