Merge pull request #79 from SpicyDarkFox/dbg

Последние фиксы

Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/aphrodisiac.ftl

@@ -0,0 +1,27 @@
+reagent-name-LPPAphrodisiac = Афродизиак
+reagent-desc-LPPAphrodisiac = Концентрированный препарат прямиком из Ада, повышающий либидо любого, кто его примет.
+reagent-physdesc-LPPAphrodisiac = ароматное и возбуждающиее
+
+reagent-name-LPPAphrodisiacReduced = Разбавленный афродизиак
+reagent-desc-LPPAphrodisiacReduced = Ослабленный препарат, повышающий либидо любого, кто его примет.
+reagent-physdesc-LPPAphrodisiacReduced = ароматное и головокружащее
+
+reagent-name-Rubrine = Рубрин
+reagent-desc-Rubrine = Рассеивающее вещество, способное снять внутреннее напряжение.
+reagent-physdesc-Rubrine = испаряющее
+
+reagent-name-Neclanox = Некланокс
+reagent-desc-Neclanox = Данный препарат способен остановить некроз, однако не без вреда для организма
+reagent-physdesc-Neclanox = оживляющее
+
+reagent-name-Lucipherium = Люцифериум
+reagent-desc-Lucipherium = Зловещий препарат, наполненный частичкой Ада.
+reagent-physdesc-Lucipherium = концентрированное зло
+
+reagent-name-Necrotoxins = Некротоксин
+reagent-desc-Necrotoxins = Результат гниения
+reagent-physdesc-Necrotoxins = гниющее
+
+reagent-name-Heamotoxic = Гемотоксин
+reagent-desc-Heamotoxic = Кислотное вещество
+reagent-physdesc-Heamotoxic = токсичное

Resources/Prototypes/Body/Parts/ipc.yml

@@ -17,7 +17,7 @@
 - type: entity
   id: TorsoIPC
   name: "ipc torso"
-  parent: PartIPC
+  parent: [PartIPC, BaseTorso]
   components:
   - type: Sprite
     netsync: false

Resources/Prototypes/Body/Prototypes/ipc.yml

@@ -9,6 +9,7 @@
       - torso
       organs:
         eyes: OrganIPCEyes
+        brain: PositronicBrain
     torso:
       part: TorsoIPC
       connections:
@@ -17,7 +18,6 @@
       - left leg
       - right leg
       organs:
-        brain: PositronicBrain
         heart: OrganIPCPump
     right arm:
       part: RightArmIPC

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -61,7 +61,7 @@
 - type: cargoProduct
   id: ServiceBureaucracy
   icon:
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen
   product: CrateServiceBureaucracy
   cost: 1000
@@ -187,4 +187,3 @@
   cost: 300
   category: cargoproduct-category-name-service
   group: market
-

Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml

@@ -20,10 +20,9 @@
     LPPGorkaAtmos: 3
     LPPGorkaWithReflectorsAtmos: 3
     LPPQmcAtmos: 3
-    LPPQmsyndAtmos: 3
     LPPSkirtleneckAtmos: 3
     LPPSkirtleneckQMAtmos: 3
     LPPSupplyChiefAtmos: 3
     LPPSupplyChiefSkirtAtmos: 3
     LPPTurtleneckQmAtmos: 3
-    LPPUtilAtmos: 3
+    LPPUtilAtmos: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml

@@ -22,7 +22,6 @@
     LPPGorkaEngi: 3
     LPPGorkaWithReflectorsEngi: 3
     LPPQmcEngi: 3
-    LPPQmsyndEngi: 3
     LPPSkirtleneckEngi: 3
     LPPSkirtleneckQMEngi: 3
     LPPSupplyChiefEngi: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -28,7 +28,6 @@
     LPPGorkaMedic: 4
     LPPGorkaMedicVarg: 4
     LPPQmcMedic: 4
-    LPPQmsyndMedic: 4
     LPPSkirtleneckMedic: 4
     LPPSkirtleneckQMMedic: 4
     LPPSupplyChiefMedic: 4

Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml

@@ -15,6 +15,6 @@
     Fulton: 2
 #LPP
     WeaponCrusherDagger: 2
-  ContrabandInventory:
-    LPPWeaponSyndieGlaive: 1
-    ClothingBackpackDuffelSyndicate: 1
+  contrabandInventory:
+    # LPPWeaponSyndieGlaive: 1
+    ClothingBackpackDuffelSyndicate: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -22,7 +22,6 @@
     LPPGorkaRnd: 3
     LPPGorkaRndVarg: 3
     LPPQmcRnd: 3
-    LPPQmsyndRnd: 3
     LPPSkirtleneckRnd: 3
     LPPSkirtleneckQMRnd: 3
     LPPSupplyChiefRnd: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

@@ -31,4 +31,3 @@
     FoodBoxDonut: 2
     #box evidence
     LPPTelebaton: 3 #LPP
-    LPPWeaponEnergyGunSoleil: 3 #LPP

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -33,7 +33,6 @@
     LPPGorkaSec: 3
     LPPGorkaSecVarg: 3
     LPPQmcSec: 3
-    LPPQmsyndSec: 3
     LPPSkirtleneckSec: 3
     LPPSkirtleneckQMSec: 3
     LPPSupplyChiefSec: 3
@@ -50,5 +49,5 @@
     ClothingHeadBandBlack: 2
     ClothingHeadBandSkull: 1
     LPPClothingHeadSecHat: 2
-  ContrabandInventory:
-    ClothingMaskClownSecurity: 1
+  # contrabandInventory:
+  #   ClothingMaskClownSecurity: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml

@@ -15,18 +15,18 @@
     LPPGorkaVirology: 2
     LPPGorkaVirologyVarg: 2
     LPPQmcVirology: 2
-    LPPQmcSyndVirology: 2
-    LPPSkirtleneck: 2
-    LPPSkirtleneck2: 2
-    LPPSkirtleneckQM: 2
-    LPPSkirtleneckQM2: 2
-    LPPSupplyChief: 2
-    LPPSupplyChief2: 2
-    LPPSupplyChiefSkirt: 2
-    LPPSupplyChiefSkirt2: 2
-    LPPTurtleneckQM: 2
-    LPPTurtleneckQM2: 2
+    # LPPQmcSyndVirology: 2
+    # LPPSkirtleneck: 2
+    # LPPSkirtleneck2: 2
+    # LPPSkirtleneckQM: 2
+    # LPPSkirtleneckQM2: 2
+    # LPPSupplyChief: 2
+    # LPPSupplyChief2: 2
+    # LPPSupplyChiefSkirt: 2
+    # LPPSupplyChiefSkirt2: 2
+    # LPPTurtleneckQM: 2
+    # LPPTurtleneckQM2: 2
     LPPUtilVirology: 2
     LPPVirologyBlackSkirt: 2
     LPPVirologyTechjean: 2
-    LPPMedicBlackSkirt2: 2
+    LPPMedicBlackSkirt2: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1710,17 +1710,6 @@
 
 # LPP
 
-- type: listing
-  id: LPPUplinkGlaive
-  name: Кроваво красная глефа
-  description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором...
-  icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
-  productEntity: LPPWeaponSyndieGlaive
-  cost:
-    Telecrystal: 8
-  categories:
-  - UplinkWeapons
-
 - type: listing
   id: LPPUplinkupgrwebbing
   name: разгрузочный жилет "Хомяк"
@@ -1732,17 +1721,6 @@
   categories:
     - UplinkArmor
 
-- type: listing
-  id: LPPUplinkAcientHardsuitSyndie
-  name: древний скафандр Синдиката
-  description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации
-  icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
-  productEntity: LPPClothingOuterHardsuitAcientSyndie
-  cost:
-    Telecrystal: 11
-  categories:
-  - UplinkArmor
-
 - type: listing
   id: LPPUplinkEcbow
   name: мини арбалет синдиката

Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml

@@ -36,8 +36,8 @@
       collection: HarpyPews
     HarpyBang:
       collection: HarpyBangs
-    Beep:
-      collection: HarpyBeeps
+    # HarpyBeep:
+    #   collection: HarpyBeeps
     HarpyRev:
       collection: HarpyRevs
     Click:

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -108,18 +108,14 @@
   - type: ZombieImmune
   - type: TTS
     voice: Jarvis
-  - type: LanguageKnowledge
+  - type: PsionicInsulation
+  - type: LanguageKnowledge   #для ТТС
     speaks:
     - GalacticCommon
     - RobotTalk
     understands:
     - GalacticCommon
     - RobotTalk
-  - type: PsionicInsulation
-  - type: LanguageSpeaker   #для ТТС
-    SpokenLanguages:
-    - GalacticCommon
-    - RobotTalk
 
 - type: entity
   parent: MobSiliconBase

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -759,7 +759,7 @@
   description: If you are not an admin please return this PDA to the nearest admin.
   components:
   - type: Pda
-    id: PassengerIDCard
+    id: CaptainIDCard
   - type: HealthAnalyzer
     scanDelay: 0
   - type: CartridgeLoader

Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml

@@ -64,7 +64,7 @@
             - Brain
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, OrganHumanBrain]
   id: PositronicBrain
   name: positronic brain
   description: An artificial brain capable of spontaneous neural activity.
@@ -76,6 +76,7 @@
         map: ["base"]
     - type: Input
       context: human
+    - type: Brain
     - type: BlockMovement
     - type: ToggleableGhostRole
       examineTextMindPresent: positronic-brain-installed

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -303,8 +303,8 @@
   params:
     variation: 0.05
   sounds:
-    Beep:
-      path: /Audio/Machines/twobeep.ogg
+    # Beep:
+    #   path: /Audio/Machines/twobeep.ogg
     Chime:
       path: /Audio/Machines/chime.ogg
     Buzz:
@@ -447,8 +447,8 @@
       path: /Audio/Effects/tesla_consume.ogg
       params:
         variation: 0.125
-    Beep:      # normal
-      path: /Audio/Voice/IPC/beep_2000.ogg
+    # Beep:      # normal
+    #   path: /Audio/Voice/IPC/beep_2000.ogg
     Boop:
       path: /Audio/Voice/IPC/beep_500.ogg
     Buzz: