На этом коммите гитхаб поставит галочку

space-sunrise · Jun 23, 2024 · 64474fc · 64474fc
1 parent 0e2288f
commit 64474fc
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 58 deletions.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl
@@ -28,10 +28,6 @@ ent-FoodSnackSus = джерки Сас
     .desc = Что-то в этом упаковке заставляет вас чувствовать себя невероятно тревожно. Хотя джерки вкусное.
 ent-FoodSnackSyndi = синди-кексы
     .desc = Очень вкусные кексы, которые сохраняют свой вкус даже после ядерного взрыва.
-ent-DrinkRamen = чашка рамэна
-    .desc = Просто добавьте 10 мл кипятка! Вкус, напоминающий школьные годы.
-ent-DrinkHellRamen = чашка адского рамэна
-    .desc = Просто добавьте 10 мл кипятка! Супер острый вкус.
 ent-FoodSnackChowMein = чоу мейн
     .desc = Солоноватая жареная лапша. Похоже, что они забыли про овощи.
 ent-FoodSnackDanDanNoodles = лапша дань-дань

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -1,22 +1,22 @@
-# Senior Time
-- type: loadoutEffectGroup
-  id: SeniorPhysician
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobChemist
-      time: 36000 # 10 hrs Sunrise-RoleTime
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobMedicalDoctor
-      time: 36000 # 10 hrs Sunrise-RoleTime
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:DepartmentTimeRequirement
-      department: Medical
-      time: 108000 # 30 hrs Sunrise-RoleTime
+# # Senior Time
+# - type: loadoutEffectGroup
+#   id: SeniorPhysician
+#   effects:
+#   - !type:JobRequirementLoadoutEffect
+#     requirement:
+#       !type:RoleTimeRequirement
+#       role: JobChemist
+#       time: 36000 # 10 hrs Sunrise-RoleTime
+#   - !type:JobRequirementLoadoutEffect
+#     requirement:
+#       !type:RoleTimeRequirement
+#       role: JobMedicalDoctor
+#       time: 36000 # 10 hrs Sunrise-RoleTime
+#   - !type:JobRequirementLoadoutEffect
+#     requirement:
+#       !type:DepartmentTimeRequirement
+#       department: Medical
+#       time: 108000 # 30 hrs Sunrise-RoleTime
 
 # Other Timers
 
@@ -125,33 +125,33 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtMedicalDoctor
 
-- type: loadout
-  id: SeniorPhysicianJumpsuit
-  equipment: SeniorPhysicianJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
+# - type: loadout
+#   id: SeniorPhysicianJumpsuit
+#   equipment: SeniorPhysicianJumpsuit
+#   effects:
+#   - !type:GroupLoadoutEffect
+#     proto: SeniorPhysician
+#   - !type:GroupLoadoutEffect
+#     proto: MaleMoment
 
-- type: startingGear
-  id: SeniorPhysicianJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSeniorPhysician
+# - type: startingGear
+#   id: SeniorPhysicianJumpsuit
+#   equipment:
+#     jumpsuit: ClothingUniformJumpsuitSeniorPhysician
 
-- type: loadout
-  id: SeniorPhysicianJumpskirt
-  equipment: SeniorPhysicianJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
+# - type: loadout
+#   id: SeniorPhysicianJumpskirt
+#   equipment: SeniorPhysicianJumpskirt
+#   effects:
+#   - !type:GroupLoadoutEffect
+#     proto: SeniorPhysician
+#   - !type:GroupLoadoutEffect
+#     proto: WomanMoment
 
-- type: startingGear
-  id: SeniorPhysicianJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSeniorPhysician
+# - type: startingGear
+#   id: SeniorPhysicianJumpskirt
+#   equipment:
+#     jumpsuit: ClothingUniformJumpskirtSeniorPhysician
 
 - type: loadout
   id: MedicalBlueScrubs

diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -152,17 +152,17 @@
   equipment:
     outerClothing: ClothingOuterWinterRobo
 
-- type: loadout
-  id: SeniorResearcherLabCoat
-  equipment: SeniorResearcherLabCoat
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherLabCoat
-  equipment:
-    outerClothing: ClothingOuterCoatLabSeniorResearcher
+# - type: loadout
+#   id: SeniorResearcherLabCoat
+#   equipment: SeniorResearcherLabCoat
+#   effects:
+#   - !type:GroupLoadoutEffect
+#     proto: SeniorResearcher
+
+# - type: startingGear
+#   id: SeniorResearcherLabCoat
+#   equipment:
+#     outerClothing: ClothingOuterCoatLabSeniorResearcher
 
 # Gloves
 - type: loadout