Merge pull request #21 from PyotrIgn/ERT_antiREV

Обновление ОБР и фиксы
AdventureTimeSS14 · Oct 8, 2023 · 2e88cca · 2e88cca
2 parents 5effc13 + e59bc62
commit 2e88cca
Show file tree

Hide file tree

Showing 23 changed files with 576 additions and 121 deletions.
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -277,3 +277,15 @@ Entries:
   - {message: Возвращена возможность играть за кадета. интерна. лаборанта и инженера-стажера даже при открытии более высоких ролей в отделе., type: fix}
   id: 55580 #костыль отображения в Обновлениях
   time: '2023-10-07T09:19:00.0000000+00:00'
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: Повышен порог этанола в крови для алкогольного отравления и уменьшена крепкость пива для Октоберфеста., type: Tweak}
+  - {message: Убран наш имплант Майндшилда - он был нужен только для РП., type: Remove}
+  - {message: Изменено время открытия инженера-стажера., type: Tweak}
+  - {message: Главы которые могли быть антагонистами (ГВ. НР и КМ) не имеют теперь импланта Майндшилда и могут присоединиться к революции (и их смерть не требуется для успеха революции)., type: Tweak}
+  - {message: Откат запрета унатхам есть не-мясные продукты., type: Tweak}
+  - {message: РХБЗЗ получили магнитные ботинки ОБР., type: Tweak}
+  - {message: ОБР по снаряжению поделены на два типа - против ЯО и против революций., type: Tweak}
+  id: 55581 #костыль отображения в Обновлениях
+  time: '2023-10-08T06:19:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Lixon/BeltMilitaryWebbing.ftl b/Resources/Locale/ru-RU/ADT/Lixon/BeltMilitaryWebbing.ftl
@@ -7,3 +7,10 @@ ent-ADTClothingBeltMilitaryWebbingRPSL = РПС ОБР Лидера
 ent-ADTClothingBeltMilitaryWebbingRPSML = РПС ОБР Медика
     .desc = "РПС медика ОБР"
     .suffix = { "" }
+
+ent-ADTClothingBeltMilitaryWebbingRPSSL_Rev = РПС ОБР СБ
+    .desc = "РПС службы безопасности ОБР"
+    .suffix = { "Против беспорядков" }
+ent-ADTClothingBeltMilitaryWebbingRPSL_Rev = РПС ОБР Лидера
+    .desc = "РПС лидера ОБР"
+    .suffix = { "Против беспорядков" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl
@@ -59,3 +59,19 @@ ent-ClothingBackpackSalvageFilled = { ent-ClothingBackpackSalvage }
 ent-ClothingBackpackPirateFilled = { ent-ClothingBackpackSatchelLeather }
     .suffix = Заполненный, Пират
     .desc = { ent-ClothingBackpackSatchelLeather.desc }
+
+ent-ClothingBackpackERTLeaderFilledREV = { ent-ClothingBackpackERTLeader }
+    .suffix = Против бунтов
+    .desc = { ent-ClothingBackpackERTLeader.desc }
+
+ent-ClothingBackpackERTMedicalFilledREV = { ent-ClothingBackpackERTMedical }
+    .suffix = Против бунтов
+    .desc = { ent-ClothingBackpackERTMedical.desc }
+
+ent-ClothingBackpackERTEngineerFilledREV = { ent-ClothingBackpackERTEngineer }
+    .suffix = Против бунтов
+    .desc = { ent-ClothingBackpackERTEngineer.desc }
+
+ent-ClothingBackpackERTSecurityFilledREV = { ent-ClothingBackpackERTSecurity }
+    .suffix = Против бунтов
+    .desc = { ent-ClothingBackpackERTSecurity.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl
@@ -1,27 +1,27 @@
 ent-RandomHumanoidSpawnerERTLeader = ОБР лидер
     .desc = { "" }
 ent-RandomHumanoidSpawnerERTLeaderEVA = ОБР лидер
-    .suffix = EVA
+    .suffix = Против ЯО
     .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
 ent-RandomHumanoidSpawnerERTJanitor = ОБР уборщик
     .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
 ent-RandomHumanoidSpawnerERTJanitorEVA = ОБР уборщик
-    .suffix = EVA
+    .suffix = Против ЯО
     .desc = { ent-RandomHumanoidSpawnerERTJanitor.desc }
 ent-RandomHumanoidSpawnerERTEngineer = ОБР инженер
     .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
 ent-RandomHumanoidSpawnerERTEngineerEVA = ОБР инженер
-    .suffix = EVA
+    .suffix = Против ЯО
     .desc = { ent-RandomHumanoidSpawnerERTEngineer.desc }
 ent-RandomHumanoidSpawnerERTSecurity = ОБР офицер безопасности
     .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
 ent-RandomHumanoidSpawnerERTSecurityEVA = ОБР офицер безопасности
-    .suffix = EVA
+    .suffix = Против ЯО
     .desc = { ent-RandomHumanoidSpawnerERTSecurity.desc }
 ent-RandomHumanoidSpawnerERTMedical = ОБР медик
     .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
 ent-RandomHumanoidSpawnerERTMedicalEVA = ОБР медик
-    .suffix = EVA
+    .suffix = Против ЯО
     .desc = { ent-RandomHumanoidSpawnerERTMedical.desc }
 ent-RandomHumanoidSpawnerCBURNUnit = Агент РХБЗЗ
     .desc = { "" }
@@ -34,3 +34,16 @@ ent-RandomHumanoidSpawnerNukeOp = Ядерный оперативник
 ent-RandomHumanoidSpawnerCluwne = Клувень
     .suffix = Спавнит клувеня
     .desc = { "" }
+
+ent-RandomHumanoidSpawnerERTLeaderREV = ОБР лидер
+    .suffix = Против бунтов
+    .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
+ent-RandomHumanoidSpawnerERTEngineerREV = ОБР инженер
+    .suffix = Против бунтов
+    .desc = { ent-RandomHumanoidSpawnerERTEngineer.desc }
+ent-RandomHumanoidSpawnerERTSecurityREV = ОБР офицер безопасности
+    .suffix = Против бунтов
+    .desc = { ent-RandomHumanoidSpawnerERTSecurity.desc }
+ent-RandomHumanoidSpawnerERTMedicalREV = ОБР медик
+    .suffix = Против бунтов
+    .desc = { ent-RandomHumanoidSpawnerERTMedical.desc }
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_armory.yml b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_armory.yml
@@ -1,9 +1,9 @@
-- type: cargoProduct
-  id: ADTMindShieldImplantCargo
-  icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
-  product: ADTCrateMindshieldImplants
-  cost: 3000
-  category: Armory
-  group: market
+#- type: cargoProduct
+#  id: ADTMindShieldImplantCargo
+#  icon:
+#    sprite: Objects/Specific/Chemistry/syringe.rsi
+#    state: syringe_base0
+#  product: ADTCrateMindshieldImplants
+#  cost: 3000
+#  category: Armory
+#  group: market
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml
@@ -1,8 +1,8 @@
-- type: entity
-  id: ADTCrateMindshieldImplants
-  parent: CrateCommandSecure
-  components:
-  - type: StorageFill
-    contents:
-      - id: ADTMindShieldImplanter
-        amount: 2
+#- type: entity
+#  id: ADTCrateMindshieldImplants
+#  parent: CrateCommandSecure
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - id: ADTMindShieldImplanter
+#        amount: 2
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml
@@ -67,6 +67,30 @@
       - id: ExGrenade
         amount: 3
 
+- type: entity
+  id: ADTClothingBeltMilitaryWebbingRPSSL_Rev
+  parent: ClothingBeltMilitaryWebbing
+  name: ERT security belt
+  description: Part of ERT security's gear
+  suffix: Anti-REV
+  components:
+  - type: Storage
+    capacity: 50
+  - type: StorageFill
+    contents:
+      - id: EmergencyMedipen
+        amount: 2
+      #- id: MagazinePistolHighCapacity
+      #- id: WeaponPistolViper
+      #- id: MedicatedSuture
+      #- id: ExGrenade
+      #  amount: 3
+      - id: ADTtelescopicBaton
+      - id: Stunbaton
+      - id: Flash
+      - id: Handcuffs
+        amount: 3
+
 #RPSL
 - type: entity
   id: ADTClothingBeltMilitaryWebbingRPSL
@@ -86,6 +110,30 @@
       - id: ExGrenade
         amount: 3
 
+- type: entity
+  id: ADTClothingBeltMilitaryWebbingRPSL_Rev
+  parent: ClothingBeltMilitaryWebbing
+  name: ERT Leader belt
+  description: Part of ERT leader's gear
+  suffix: Anti-REV
+  components:
+  - type: Storage
+    capacity: 50
+  - type: StorageFill
+    contents:
+      - id: EmergencyMedipen
+        amount: 2
+      #- id: MagazinePistolHighCapacity
+      #- id: WeaponPistolViper
+      #- id: MedicatedSuture
+      #- id: ExGrenade
+      #  amount: 3
+      - id: ADTtelescopicBaton
+      - id: Stunbaton
+      - id: Flash
+      - id: Handcuffs
+        amount: 3
+
 #RPSM
 - type: entity
   id: ADTClothingBeltMilitaryWebbingRPSML

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml
@@ -1,16 +1,16 @@
-- type: entity
-  parent: BaseSubdermalImplant
-  id: ADTMindShieldImplant
-  name: mind shield implant
-  description: Mindshield implant, protect fromo hypnosis by a enemy of NanoTrasen.
-  noSpawn: true
-  components:
-    - type: SubdermalImplant
+#- type: entity
+#  parent: BaseSubdermalImplant
+#  id: ADTMindShieldImplant
+#  name: mind shield implant
+#  description: Mindshield implant, protect fromo hypnosis by a enemy of NanoTrasen.
+#  noSpawn: true
+#  components:
+#    - type: SubdermalImplant
 
-- type: entity
-  id: ADTMindShieldImplanter
-  name: mind shield implanter
-  parent: BaseImplantOnlyImplanter
-  components:
-    - type: Implanter
-      implant: ADTMindShieldImplant
+#- type: entity
+#  id: ADTMindShieldImplanter
+#  name: mind shield implanter
+#  parent: BaseImplantOnlyImplanter
+#  components:
+#    - type: Implanter
+#      implant: ADTMindShieldImplant
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml
@@ -14,7 +14,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.3
+        amount: 0.2
       - !type:HealthChange
         damage:
           groups:
@@ -45,7 +45,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.3
+        amount: 0.2
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.2
@@ -69,7 +69,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.35
+        amount: 0.25
     Medicine:
       effects:
       - !type:AdjustTemperature
@@ -97,7 +97,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.2
+        amount: 0.15
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.1
@@ -121,7 +121,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.35
+        amount: 0.25
     Medicine:
       effects:
       - !type:AdjustTemperature
@@ -149,7 +149,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.35
+        amount: 0.25
       - !type:MovespeedModifier
         walkSpeedModifier: 1.1
         sprintSpeedModifier: 1.1
@@ -179,7 +179,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.35
+        amount: 0.3
       - !type:MovespeedModifier
         walkSpeedModifier: 0.85
         sprintSpeedModifier: 0.85
@@ -203,7 +203,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.45
+        amount: 0.35
       - !type:HealthChange
         damage:
           types:

diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -1,14 +1,14 @@
-- type: entity
+- type: entity
   id: OrganReptilianStomach
   parent: OrganAnimalStomach
   noSpawn: true
   components:
   - type: Stomach
-    specialDigestible:
-      tags:
-      - Fruit
-      - Meat
-      - Pill
+    #specialDigestible:
+    #  tags:
+    #  - Fruit
+    #  - Meat
+    #  - Pill
   - type: SolutionContainerManager
     solutions:
       stomach: