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

Спрайтень

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl

@@ -1,128 +1 @@
-ent-PrintedDocument = { ent-Paper }
-    .desc = Боюрократическая единица. Документ, распечатанный на принтере.
-ent-PrintedDocumentReportStation = Отчёт о ситуации на станции
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReportOnEliminationOfViolations = Отчёт об устранении нарушений
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReporDepartment = Отчёт о работе отдела
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReportEmployeePerformance = Отчёт о работе сотрудника
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReportOnTheChaptersMeeting = Отчёт о собрании глав
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentInternalAffairsAgentsReport = Отчёт о внутреннем расследовании
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentConditionReport = Отчёт о техническом состоянии
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReportStudyObject = Отчёт об изучении объекта
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentExperimentReport = Отчёт об эксперименте
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentDisposalReport = Отчёт об утилизации
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentApplicationAppointmentInterim = Заявление о назначении на ВрИО
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentApplicationEmployment = Заявление о трудоустройстве
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentLetterResignation = Заявление об увольнении
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentApplicationAccess = Заявление на получение доступа
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentApplicationEquipment = Заявление на получение снаряжения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentAppeal = Обращение
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentEvacuationShuttleRequest = Запрос эвакуационного шаттла
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentShuttleRegistrationRequest = Запрос регистрации шаттла
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestCallMembersCentralCommitteeDSO = Запрос на вызов членов ЦК, ДСО
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestRequestToEstablishThreatLevel = Запрос установления уровня угрозы
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestChangeSalary = Запрос на изменение заработной платы
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestForNonlistedEmployment = Запрос внеперечневого трудоустройства
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestForPromotion = Запрос повышения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestDocuments = Запрос предоставления документов
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestEuthanasia = Запрос на проведение эвтаназии
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestConstructionWork = Запрос на проведение строительных работ
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentRequestModernization = Запрос на проведение модернизации
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentComplaintViolationLaborRules = Жалоба на нарушение трудового порядка
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentComplaintOffense = Жалоба на правонарушение
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPermissionEquipment = Разрешение на использование снаряжения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPermissionToTravelInCaseOfThreat = Разрешение на передвижение при угрозе
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentSearchPermission = Разрешение на обыск
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPermissionToCarryWeapons = Разрешение на ношение оружия
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPrescriptionDrugAuthorization = Разрешение на рецептурный препарат
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPermissionDisposeBody = Разрешение на утилизацию тела
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentConstructionPermit = Разрешение на строительство
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentPermissionToExtendMarriage = Разрешение на расширение брака
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderDismissal = Приказ об увольнении
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderDeprivationAccess = Приказ о лишении доступа
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderEncouragement = Приказ о поощрении
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderParolePrisoner = Приказ об УДО заключенного
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderRecognizingSentienceCreature = Приказ о признании разумности существа
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderMedicalIntervention = Распоряжение о медицинском вмешательстве
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentProductManufacturingOrder = Заказ на производство продукта
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderPurchaseResourcesEquipment = Заказ на закупку ресурсов, снаряжения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderingSpecialEquipment = Заказ специального снаряжения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentOrderPurchaseWeapons = Заказ на закупку вооружения
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentCertificate = Грамота
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentCertificateAdvancedTraining = Свидетельство о повышении квалификации
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentCertificateOffense = Свидетельство о правонарушении
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentDeathCertificate = Свидетельство о смерти
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentMarriageCertificate = Свидетельство о заключении брака
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentDivorceCertificate = Свидетельство о расторжении брака
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentClosingIndictment = Обвинительное заключение
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentSentence = Приговор
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentJudgment = Судебное решение
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentStatementHealth = Заключение о состоянии здоровья
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentDecisionToStartTrial = Решение о начале судебного процесса
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentErrorLoadingFormHeader = Оͬ͌̔̄̀Ш̫̼̈ͭͧͅИ̣̩̰̳Б̥̜̥̇͊̿͆̍̚̕К̫̽̍̋ͫ́͛͑А̛̼̚ загрузки заголовка формы
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentNoticeOfLiquidation = УвЕдОмЛеНиЕ о ЛиКвИдАцИи
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentBusinessDeal = ДеЛоВаЯ сДеЛкА
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentNoteBeginningMilitaryActions = НоТа О нАчАлЕ вОеНнЫх ДеЙсТвИй
-    .desc = { ent-PrintedDocument.desc }
-ent-PrintedDocumentReportAccomplishmentGoals = ОтЧёТ о ВыПоЛнЕнИи ЦеЛеЙ
-    .desc = { ent-PrintedDocument.desc }
+# Потом

Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml

@@ -3,7 +3,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
       type:
@@ -27,7 +27,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
       type:
@@ -51,7 +51,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
       type:
@@ -75,7 +75,7 @@
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
       type:

Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml

@@ -3,7 +3,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/fox_parts.rsi
     state: ears_fox_outer

Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -114,7 +114,7 @@
   id: HumanHairCotton
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: cotton
@@ -155,7 +155,7 @@
   id: HumanHairFingerwave
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: fingerwave
@@ -172,7 +172,7 @@
   id: HumanHairFortuneteller
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: fortuneteller
@@ -181,7 +181,7 @@
   id: HumanHairFortunetellerAlt
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: fortuneteller_alt
@@ -326,7 +326,7 @@
   id: HumanHairLongdtails
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: longdtails
@@ -359,7 +359,7 @@
   id: HumanHairLooseSlicked
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: loose_slicked
@@ -408,7 +408,7 @@
   id: HumanHairQuadcurls
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: quadcurls
@@ -441,7 +441,7 @@
   id: HumanHairShy
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: shy
@@ -514,7 +514,7 @@
   id: HumanHairSpicy
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: spicy
@@ -555,7 +555,7 @@
   id: HumanHairWife
   bodyPart: Hair
   markingCategory: Hair
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/human_hair.rsi
       state: wife

Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml

@@ -3,7 +3,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
     state: ears_slime_cat_outer
@@ -15,7 +15,7 @@
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
     state: slime_tail_cat_wag # Corvax-Sponsors
@@ -25,7 +25,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
     state: ears_slime_stubby_outer
@@ -37,7 +37,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
     state: ears_slime_curled_outer
@@ -49,7 +49,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
     state: ears_slime_torn_outer
@@ -61,7 +61,7 @@
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
     - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
       state: slime_tail_cat_wag_stripes_prime

Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml

@@ -3,7 +3,7 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [SlimePerson]
-  sponsorOnly: true # Corvax-Sponsors
+  #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi
     state: ears_slime_fox_outer

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -117,20 +117,20 @@
     sprite: Corvax/Objects/Consumable/Drinks/espressoMartini.rsi
     state: icon
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkKvassGlass
-  suffix: kvass
-  components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Kvass
-              Quantity: 30
-    - type: Sprite
-      sprite: Corvax/Objects/Consumable/Drinks/kvass.rsi
+#- type: entity No Kvas yet
+#  parent: DrinkGlassBase
+#  id: DrinkKvassGlass
+#  suffix: kvass
+#  components:
+#    - type: SolutionContainerManager
+#      solutions:
+#        drink:
+#          maxVol: 30
+#          reagents:
+#            - ReagentId: Kvass
+#              Quantity: 30
+#    - type: Sprite
+#      sprite: Corvax/Objects/Consumable/Drinks/kvass.rsi
 
 - type: entity
   parent: DrinkGlass