Merge pull request #17 from Corvax-Frontier/Zekins3366-patch-1

мини-апштрим
Corvax-Frontier · Apr 8, 2024 · 26817f8 · 26817f8
2 parents 5f6eb47 + 65d6366
commit 26817f8
Show file tree

Hide file tree

Showing 12 changed files with 5,623 additions and 1,470 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3950,3 +3950,9 @@ Entries:
       message: 'Added the NC Piecrust: a combination ranch and pie bakery vessel'
   id: 4902
   time: '2024-04-07T02:37:35.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Add
+      message: Added the SBB Bookworm, a medium-sized library ship.
+  id: 4903
+  time: '2024-04-08T05:42:23.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/_NF/job/job-names.ftl b/Resources/Locale/ru-RU/_NF/job/job-names.ftl
@@ -1,12 +1,12 @@
 job-name-ertmailcarrier = ОБР почтальон
 job-name-mercenary = наёмник
 job-name-pilot = пилот
-job-name-security-guard = охранник
+job-name-security-guard = охрана аванпоста
 job-name-stc = диспетчер станции
 # Role timers - Make these alphabetical or I cut you
 JobERTMailCarrier = ОБР почтальон
 # Role timers - Make these alphabetical or I cut you
 JobMercenary = наёмник
 JobPilot = пилот
-JobSecurityGuard = охранник
+JobSecurityGuard = охрана аванпоста
 JobSTC = диспетчер станции
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -47,7 +47,7 @@ job-name-zookeeper = зоотехник
 job-name-senior-engineer = ведущий инженер
 job-name-senior-researcher = ведущий учёный
 job-name-senior-physician = ведущий врач
-job-name-senior-officer = инструктор СБ
+job-name-senior-officer = инструктор ДСБФ
 job-name-visitor = посетитель
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = атмосферный техник

diff --git a/Resources/Locale/ru-RU/nyanotrasen/nyano-jobs.ftl b/Resources/Locale/ru-RU/nyanotrasen/nyano-jobs.ftl
@@ -4,7 +4,7 @@ job-name-fugitive = беглец
 job-name-prisoner = заключенный
 job-name-valet = камердинер
 job-name-guard = тюремщик
-job-name-martialartist = Мастер боевых искуств
+job-name-martialartist = мастер боевых искуств
 job-description-mail-carrier = Доставляйте почту. Избегайте собак.
 job-description-gladiator = Дайте хлеба и зрелищ команде. Сражайтесь за честь и отвагу.
 job-description-fugitive = Сбегите со станции живым.

diff --git a/Resources/Maps/_NF/Shuttles/bookworm.yml b/Resources/Maps/_NF/Shuttles/bookworm.yml
diff --git a/Resources/Maps/_NF/Shuttles/cleithro.yml b/Resources/Maps/_NF/Shuttles/cleithro.yml
diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
@@ -55,6 +55,11 @@
     speechSounds: Vulpkanin
     speechVerb: Vulpkanin
   - type: LightweightDrunk
+  - type: InteractionPopup # Corvax-Frontier-Vulpkanin
+    successChance: 1
+    interactSuccessString: pat-success-generic
+    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+    messagePerceivedByOthers: pat-success-generic-others
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Vulpkanin

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -87,6 +87,7 @@
   - HeadOfSecurity
   - SecurityCadet
   - SecurityOfficer
+  - SeniorOfficer # Corvax-Frontier
   - Warden
   - PrisonGuard ##nyano
   - Prisoner ##nyano

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
@@ -23,3 +23,16 @@
       - id: ClothingMaskBreathMedical # Frontier
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
+
+- type: entity
+  id: LockerPsychologistFilled
+  name: psychologist's locker
+  suffix: Filled
+  parent: LockerMedical
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskSterile
+      - id: BoxFolderWhite
+      - id: PillCanisterTricordrazine
+      - id: RubberStampPsychologist
diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
@@ -0,0 +1,28 @@
+- type: vessel
+  id: Bookworm
+  name: SBB Буквоед
+  description: Среднегабаритный космический источник знаний. Рекомендованный состав команды 1-3 человека.
+  price: 28000
+  category: Medium
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/bookworm.yml
+
+- type: gameMap
+  id: Bookworm
+  mapName: 'SBB Bookworm'
+  mapPath: /Maps/_NF/Shuttles/bookworm.yml
+  minPlayers: 0
+  stations:
+    Bookworm:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Буквоед {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Librarian: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml
@@ -12,7 +12,7 @@
   id: Skipper
   name: NC Шкипер
   description: Малогабаритный ботанический шаттл-ресторан. Рекомендованный состав команды 1-2 человека.
-  price: 29715
+  price: 37500
   category: Small
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/skipper.yml