Merge branch 'Lost-Paradise-Project:master' into master

Lost-Paradise-Project · Sep 6, 2024 · 0af905c · 0af905c
2 parents 0f6b00f + 71bb91f
commit 0af905c
Show file tree

Hide file tree

Showing 384 changed files with 374 additions and 4,571 deletions.
diff --git a/Resources/Audio/_LostParadise/Announcement/cmo.ogg b/Resources/Audio/_LostParadise/Announcement/cmo.ogg
diff --git a/Resources/Audio/_LostParadise/Announcement/hop.ogg b/Resources/Audio/_LostParadise/Announcement/hop.ogg
diff --git a/Resources/Audio/_LostParadise/Announcement/hos.ogg b/Resources/Audio/_LostParadise/Announcement/hos.ogg
diff --git a/Resources/Audio/_LostParadise/Announcement/kep.ogg b/Resources/Audio/_LostParadise/Announcement/kep.ogg
diff --git a/Resources/Audio/_LostParadise/Announcement/rd.ogg b/Resources/Audio/_LostParadise/Announcement/rd.ogg
diff --git a/Resources/Audio/_LostParadise/Announcement/se.ogg b/Resources/Audio/_LostParadise/Announcement/se.ogg
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -97,3 +97,10 @@ Entries:
   id: 10
   time: '2024-09-04T15:33:10.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/62
+- author: BL02DL
+  changes:
+    - type: Add
+      message: Добавлен руководство по Тэн-кодам в игру
+  id: 11
+  time: '2024-09-05T12:18:27.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/69
diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl
@@ -395,3 +395,4 @@ ent-LPPClothingUnderSocksThighOrange = носки
 ent-SpawnSecPilot = спавн пилота службы безопансоти
 ent-LockerWoCSyndicate = Шкафчик для хранения улик
     .desc = Для хранения мешков с гильзами и вещами задержанного.
+lathe-category-hardsuit = Скафандры
diff --git a/Resources/Locale/ru-RU/guidebook/guides.ftl b/Resources/Locale/ru-RU/guidebook/guides.ftl
@@ -65,6 +65,7 @@ guide-entry-ss14 = Станции и смены
 guide-entry-robotics = Робототехника
 guide-entry-cyborgs = Киборги
 guide-entry-security = Безопасность станции
+lppguide-entry-criminal-records = Тэн-коды
 guide-entry-forensics = Криминалистика
 guide-entry-defusal = Обезвреживание крупной бомбы
 guide-entry-criminal-records = Криминальные записи

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1758,7 +1758,7 @@
   id: LPPUplinkhelmetswat
   name: шлем спецназа синдиката
   description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов.
-  icon: { sprite: Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon }
+  icon: { sprite: Clothing/Head/Helmets/swat_syndicate.rsi, state: icon }
   productEntity: ClothingHeadHelmetSwatSyndicate
   cost:
     Telecrystal: 2

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -17,7 +17,7 @@
   access:
   - Medical
   - Security
-  - Brig
+#  - Brig
   - Maintenance
   - External
   - Corpsman
@@ -35,7 +35,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicFilled 
+    back: ClothingBackpackBrigmedicFilled
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -633,10 +633,10 @@
     - JetpackMini
   # End Nyano additions
   # Lost Paradise: start
-    - LPPERPModuleBorg
-    - LPPDroneModuleSecurityTaser
-    - LPPBorgModuleAresst
-    - LPPBattleBorgModule
+#    - LPPERPModuleBorg
+#    - LPPDroneModuleSecurityTaser
+#    - LPPBorgModuleAresst
+#    - LPPBattleBorgModule
   #  Lost Paradise: end
   - type: MaterialStorage
     whitelist:

diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml
@@ -6,6 +6,7 @@
   - Forensics
   - Defusal
   - CriminalRecords
+  - LPPTenCodes
 
 - type: guideEntry
   id: Forensics
@@ -21,3 +22,8 @@
   id: CriminalRecords
   name: guide-entry-criminal-records
   text: "/ServerInfo/Guidebook/Security/CriminalRecords.xml"
+
+- type: guideEntry
+  id: LPPTenCodes
+  name: lppguide-entry-criminal-records
+  text: "/ServerInfo/Guidebook/Security/TenCodes.xml"
diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -13,7 +13,7 @@
   supervisors: job-supervisors-rd
   access:
   - Research
-  - Robotics
+#  - Robotics
   - Maintenance
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -142,8 +142,8 @@
 - type: playTimeTracker
   id: JobSeniorPhysician
 
-# - type: playTimeTracker
-#   id: JobSeniorResearcher
+- type: playTimeTracker
+  id: JobSeniorResearcher
 
 - type: playTimeTracker
   id: JobServiceWorker

diff --git a/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml
@@ -100,15 +100,15 @@
   categories:
   - LPPCBURNArmor
 
-- type: listing
-  id: LPPCBURNCatalogArmorExosuitCommander
-  name: cburn-catalog-armor-exosuit-com-name
-  description: cburn-catalog-armor-exosuit-com-desc
-  productEntity: ClothingOuterHardsuitCBURNLeader
-  cost:
-    Telecrystal: 10
-  categories:
-  - LPPCBURNArmor
+#- type: listing
+#  id: LPPCBURNCatalogArmorExosuitCommander
+#  name: cburn-catalog-armor-exosuit-com-name
+#  description: cburn-catalog-armor-exosuit-com-desc
+#  productEntity: ClothingOuterHardsuitCBURNLeader
+#  cost:
+#    Telecrystal: 10
+#  categories:
+#  - LPPCBURNArmor
 
 - type: listing
   id: LPPCBURNCatalogArmorGasMask

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/base_borg.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/base_borg.yml
@@ -203,7 +203,7 @@
       - Cyborgs
   - type: TTS # Corvax-TTS
     voice: Vally
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - LPPSynt

diff --git a/...rces/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml b/...rces/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml
@@ -56,7 +56,7 @@
         Unsexed: FemaleHuman
     - type: Inventory
       speciesId: shark
-    - type: LanguageSpeaker
+    - type: LanguageKnowledge
       speaks:
       - GalacticCommon
       understands:

diff --git a/.../Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml b/.../Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml
@@ -58,7 +58,7 @@
       speciesId: tajaran
     # - type: EmotePanel
       race: Tajar
-    - type: LanguageSpeaker
+    - type: LanguageKnowledge
       speaks:
       - GalacticCommon
       - SikTaj

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml
@@ -48,7 +48,7 @@
   - type: ShortExamine
   - type: RequireProjectileTarget
     active: False
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     understands:
     - GalacticCommon
 

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/scuf.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/scuf.yml
diff --git a/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml b/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml
@@ -114,7 +114,7 @@
   id: LPPBulletLightRifleHunting
   name: Huntingbullet (.30 rifle)
   parent: BaseBullet
-  nospawn: true
+  noSpawn: true
   components:
   - type: Projectile
     damage: