фикс

фикс трусов фикс требования нейтрализатора глиммера исправлены переводы пацифизм в конце раунда выданы всему командованию необходимости на возраст
Lost-Paradise-Project · Sep 26, 2024 · 62aed96 · 62aed96
1 parent c44b8f7
commit 62aed96
Show file tree

Hide file tree

Showing 28 changed files with 17 additions and 20 deletions.
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -14,5 +14,5 @@ public sealed class DCCVars
     /// Its not perfect, but gets the job done.
     /// </summary>
     public static readonly CVarDef<bool> RoundEndPacifist =
-        CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
+        CVarDef.Create("game.round_end_pacifist", true, CVar.SERVERONLY);
 }
diff --git a/Resources/Locale/ru-RU/_LostParadise/rifles.ftl b/Resources/Locale/ru-RU/_LostParadise/rifles.ftl
@@ -3,6 +3,6 @@ ent-LPPWeaponRifleFNFAL = FN FAL
 ent-LPPWeaponRifleARG = винтовка ARG
     .desc = Дешевая винтовка, прошла через множество конфликтов. Использует винтовочные патроны .30 калибра.
 ent-LPPWeaponRifleBraton = брейтон
-    .desc = Автомат созданный по забытым технологиям из альтернативных реальностей. Использует патроны калибра .30 винтовочные.
+    .desc = Автомат созданный по забытым технологиям из альтернативных реальностей. Использует патроны калибра .20 винтовочные.
 ent-LPPWeaponRifleHM10 = HM-10
     .desc = Автомат спецназа старого образца, сейчас не так сильно актуален, но все еще лучше стандартных современных аналогов. Использует патроны калибра .20 винтовочные.
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml
@@ -30,24 +30,6 @@
           conditions:
             - !type:EntityAnchored {}
           steps:
-            - tag: NormalityCrystal
-              icon:
-                sprite: Nyanotrasen/Objects/Materials/materials.rsi
-                state: bluespace
-              name: a normality crystal
-              doAfter: 1
-            - tag: NormalityCrystal
-              icon:
-                sprite: Nyanotrasen/Objects/Materials/materials.rsi
-                state: bluespace
-              name: a normality crystal
-              doAfter: 1
-            - tag: NormalityCrystal
-              icon:
-                sprite: Nyanotrasen/Objects/Materials/materials.rsi
-                state: bluespace
-              name: a normality crystal
-              doAfter: 1
             - tag: NormalityCrystal
               icon:
                 sprite: Nyanotrasen/Objects/Materials/materials.rsi

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -5,6 +5,9 @@
   playTimeTracker: JobQuartermaster
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
+    - !type:CharacterAgeRequirement
+      min: 25
+      max: 80
   #  - !type:RoleTimeRequirement #DeltaV
   #    role: JobCargoTechnician
   #    time: 21600 #6 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -4,6 +4,9 @@
   description: job-description-ce
   playTimeTracker: JobChiefEngineer
   requirements:
+    - !type:CharacterAgeRequirement
+      min: 25
+      max: 80
     - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 36000 # DeltaV - 10 hours

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -7,6 +7,9 @@
   playTimeTracker: JobChiefMedicalOfficer
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
+    - !type:CharacterAgeRequirement
+      min: 25
+      max: 80
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 14400 #DeltaV 4 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -5,6 +5,9 @@
   playTimeTracker: JobResearchDirector
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
+    - !type:CharacterAgeRequirement
+      min: 25
+      max: 80
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
       min: 54000 # DeltaV - 15 hours

diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml
@@ -4,6 +4,9 @@
   description: job-description-adjutant
   playTimeTracker: JobLPPАdjutant
   requirements:
+    - !type:CharacterAgeRequirement
+      min: 25
+      max: 80
     - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 36000

diff --git a/...xtures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png b/...xtures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png
diff --git a/...extures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png b/...extures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png
diff --git a/...tures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png b/...tures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png
diff --git a/...xtures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png b/...xtures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png
diff --git a/...xtures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png b/...xtures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png
diff --git a/...extures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png b/...extures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png
diff --git a/.../_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png b/.../_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png
diff --git a/...tures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png b/...tures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png
diff --git a/...tures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png b/...tures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png
diff --git a/...Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png b/...Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png
diff --git a/...extures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png b/...extures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png
diff --git a/...tures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png b/...tures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png
diff --git a/...Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png b/...Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png
diff --git a/...extures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png b/...extures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png
diff --git a/...extures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png b/...extures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png
diff --git a/...Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png b/...Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png
diff --git a/...Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png b/...Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png
diff --git a/...tures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png b/...tures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png
diff --git a/...xtures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png b/...xtures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png
diff --git a/...ures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png b/...ures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png