diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 4aa07f5c85c..66d8c49cd72 100644 --- 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 index 61f7e81fcb3..636538bb3a2 100644 --- 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 index 1c9bd1c4b66..8486b021248 100644 --- 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 index 7d6a0e9f891..35753449803 100644 --- 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 index a1adb758592..d90ab41dfbc 100644 --- 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 index 4808bbeb72b..9aaae46646a 100644 --- 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 index 42d0011cd72..19ad537de68 100644 --- 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 index 9d59d69741c..da4aa9a5f9f 100644 --- 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 index 1f986bb2cdf..81c617c74e0 100644 --- 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 index 83139f3eca0..d13ac4f573a 100644 --- 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: diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index eaee9692baa..d4227cb45be 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -259,6 +259,34 @@ - id: C4 amount: 1 +- type: entity + noSpawn: true + parent: ClothingBackpackERTLeader + id: ClothingBackpackERTLeaderFilledREV + components: + - type: StorageFill + contents: + #- id: WeaponPulseCarbine + #- id: WeaponPulsePistol + - id: WeaponDisabler + - id: MedicatedSuture + - id: RegenerativeMesh + #- id: Handcuffs + - id: JawsOfLife + - id: BoxZiptie + - id: BoxFlashbang + - id: WeaponSubMachineGunDrozdRubber + - id: MagazinePistolSubMachineGunRubber + amount: 2 + - id: MagazinePistolSubMachineGun + amount: 2 + #- id: WeaponRifleLecter + #- id: MagazineRifle + #- id: MagazineRifle + #- id: C4 + # amount: 1 + - id: CombatKnife + - type: entity noSpawn: true parent: ClothingBackpackERTSecurity @@ -279,6 +307,34 @@ - id: C4 amount: 1 +- type: entity + noSpawn: true + parent: ClothingBackpackERTSecurity + id: ClothingBackpackERTSecurityFilledREV + components: + - type: StorageFill + contents: + #- id: WeaponPulseCarbine + #- id: WeaponPulsePistol + - id: WeaponDisabler + - id: MedicatedSuture + - id: RegenerativeMesh + #- id: Handcuffs + - id: JawsOfLife + - id: BoxZiptie + - id: BoxFlashbang + - id: WeaponSubMachineGunDrozdRubber + - id: MagazinePistolSubMachineGunRubber + amount: 2 + - id: MagazinePistolSubMachineGun + amount: 2 + #- id: WeaponRifleLecter + #- id: MagazineRifle + #- id: MagazineRifle + #- id: C4 + # amount: 1 + - id: CombatKnife + - type: entity noSpawn: true parent: ClothingBackpackERTMedical @@ -299,6 +355,35 @@ - id: MagazineRifle - id: MagazineRifle +- type: entity + noSpawn: true + parent: ClothingBackpackERTMedical + id: ClothingBackpackERTMedicalFilledREV + components: + - type: StorageFill + contents: + #- id: WeaponPulseCarbine + - id: ADTCombatHypo + - id: MedkitAdvancedFilled + #- id: OmnizineChemistryBottle + #- id: EpinephrineChemistryBottle + - id: EpinephrineChemistryBottle + - id: BluespaceBeaker + - id: Defibrillator + - id: CrowbarRed + #- id: WeaponRifleLecter + #- id: MagazineRifle + #- id: MagazineRifle + - id: WeaponDisabler + - id: BoxZiptie + - id: WeaponSubMachineGunDrozdRubber + - id: MagazinePistolSubMachineGunRubber + amount: 2 + - id: MagazinePistolSubMachineGun + amount: 1 + - id: ADTtelescopicBaton + - id: CombatKnife + - type: entity noSpawn: true parent: ClothingBackpackERTEngineer @@ -322,6 +407,38 @@ - id: ExGrenade amount: 3 +- type: entity + noSpawn: true + parent: ClothingBackpackERTEngineer + id: ClothingBackpackERTEngineerFilledREV + components: + - type: StorageFill + contents: + - id: trayScanner + - id: WeaponDisabler + - id: MedicatedSuture + - id: RegenerativeMesh + - id: RCD + - id: RCDAmmo + - id: RCDAmmo + #- id: RCDAmmo + #- id: WeaponRifleLecter + #- id: MagazineRifle + #- id: MagazineRifle + #- id: C4 + # amount: 4 + #- id: ExGrenade + # amount: 3 + - id: BoxZiptie + - id: WeaponSubMachineGunDrozdRubber + - id: MagazinePistolSubMachineGunRubber + amount: 2 + - id: MagazinePistolSubMachineGun + amount: 1 + - id: ADTtelescopicBaton + - id: CombatKnife + + - type: entity noSpawn: true parent: ClothingBackpackERTJanitor diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index f0b146792b4..408a756dfdc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -234,8 +234,8 @@ - id: ADTtelescopicBaton - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - - id: ADTMindShieldImplanter - amount: 2 + #- id: ADTMindShieldImplanter + # amount: 2 - id: MaterialBiomass amount: 3 - id: TrackingImplanter @@ -272,8 +272,8 @@ amount: 3 - id: TrackingImplanter amount: 2 - - id: ADTMindShieldImplanter - amount: 2 + #- id: ADTMindShieldImplanter + # amount: 2 - id: NitrousOxideTankFilled - id: BoxEncryptionKeyMedical # Sirena-Underwear-Start diff --git a/Resources/Prototypes/Corvax/Datasets/Names/military.yml b/Resources/Prototypes/Corvax/Datasets/Names/military.yml index 8fe40c95767..5177202ab29 100644 --- a/Resources/Prototypes/Corvax/Datasets/Names/military.yml +++ b/Resources/Prototypes/Corvax/Datasets/Names/military.yml @@ -2,63 +2,116 @@ id: NamesFirstMilitaryLeaderCorvax values: - Коммандер - - Полковник - - Подполковник + #- Полковник + #- Подполковник - Майор - - Лейтенант + #- Лейтенант - type: dataset id: NamesFirstMilitaryCorvax values: - - Прапорщик - - Старшина + #- Прапорщик + #- Старшина - Сержант - - Капрал - - Ефрейтор + #- Капрал + #- Ефрейтор + - Лейтенант + +- type: dataset + id: NamesFirstERTEngineer + values: + - Техник-лейтенант + - Техник-сержант + +- type: dataset + id: NamesFirstERTMedical + values: + - Фельдшер + - Старший фельдшер - type: dataset id: NamesLastERTCallsign values: - - Антарес - - Андромеда + #- Антарес + #- Андромеда - Бейд - - Бетельгейзе + #- Бетельгейзе - Вега - - Водолей + #- Водолей - Гинан - - Геркулес - - Денеб - - Дракон - - Зосма - - Змееносец + #- Геркулес + #- Денеб + #- Дракон + #- Зосма + #- Змееносец - Иклил - Йильдун - Канопус - - Козерог + #- Козерог - Лабр - - Лебедь + #- Лебедь - Матар - - Микроскоп - - Нави + #- Микроскоп + #- Нави - Нихал - Окул - - Орион - - Процион - - Персей + #- Орион + #- Процион + #- Персей - Ригель - - Регул - - Сириус + #- Регул + #- Сириус - Саргас - Табит - - Телец + #- Телец - Укдах - - Фомальгаут - - Феникс + #- Фомальгаут + #- Феникс - Хадар - - Хамелеон + #- Хамелеон - Целена - - Центавр - - Чау + #- Центавр + #- Чау - Шедар - Шаула - - Электра + #- Электра + - Антаро + - Тигурий + - Сикарий + - Пелеос + - Кассиан + - Калгар + - Фабиан + - Сарерван + - Сардаукар + - Атрейдес + - Коррино + - Харконен + - Раббан + - Абефор + - Амминадаб + - Багратиони + - Баланеску + - Бескид + - Вико + - Вайку + - Виххейсет + - Гинац + - Делабре + - Джуналем + - Ичихара + - Исфахан + - Исонцо + - Иставиан + - Нгара + - Ноабар + - Оссиан + - Регинауд + - Сиккунри + - Таглиари + - Хэллек + - Ши-Ланг + - Эстилон + - Экзекарий + - Язов + - Ямиаций diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml index 62a4153c00d..7b9b1d9893c 100644 --- a/Resources/Prototypes/Entities/Effects/lightning.yml +++ b/Resources/Prototypes/Entities/Effects/lightning.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: lightning id: BaseLightning abstract: true @@ -33,7 +33,7 @@ name: lightning id: Lightning parent: BaseLightning - noSpawn: true + #noSpawn: true components: - type: Lightning canArc: true @@ -42,7 +42,7 @@ name: spooky lightning id: LightningRevenant parent: BaseLightning - noSpawn: true + #noSpawn: true components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -66,7 +66,7 @@ name: charged lightning id: ChargedLightning parent: BaseLightning - noSpawn: true + #noSpawn: true components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -85,7 +85,7 @@ name: supercharged lightning id: SuperchargedLightning parent: ChargedLightning - noSpawn: true + #noSpawn: true components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -111,7 +111,7 @@ name: hypercharged lightning id: HyperchargedLightning parent: ChargedLightning - noSpawn: true + #noSpawn: true components: - type: Sprite sprite: /Textures/Effects/lightning.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 161958dd2bf..681d5fbd603 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -15,6 +15,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTLeader + #noSpawn: true - type: randomHumanoidSettings id: ERTLeader @@ -30,6 +31,7 @@ nameSegments: - NamesFirstMilitaryLeaderCorvax # Corvax-Localization - NamesLastERTCallsign # Corvax-Localization + #noSpawn: true - type: entity id: RandomHumanoidSpawnerERTLeaderEVA @@ -54,6 +56,31 @@ - type: Loadout prototypes: [ ERTLeaderGearEVA ] +#против революции + +- type: entity + id: RandomHumanoidSpawnerERTLeaderREV + parent: RandomHumanoidSpawnerERTLeader + name: ERT leader + suffix: REV + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: ertleadereva + - type: RandomHumanoidSpawner + settings: ERTLeaderREV + +- type: randomHumanoidSettings + id: ERTLeaderREV + parent: ERTLeader + components: + - type: GhostRole + name: ghost-role-information-ert-leader-name + description: ghost-role-information-ert-leader-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ ERTLeaderGearREV ] + ## ERT Janitor - type: entity @@ -70,6 +97,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTJanitor + #noSpawn: true - type: randomHumanoidSettings id: ERTJanitor @@ -85,6 +113,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTJanitorGear ] + #noSpawn: true - type: entity id: RandomHumanoidSpawnerERTJanitorEVA @@ -121,10 +150,11 @@ state: ertengineer - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstERTEngineer # Corvax-Localization - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTEngineer + #noSpawn: true - type: randomHumanoidSettings id: ERTEngineer @@ -140,6 +170,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTEngineerGear ] + #noSpawn: true - type: entity id: RandomHumanoidSpawnerERTEngineerEVA @@ -164,6 +195,31 @@ - type: Loadout prototypes: [ ERTEngineerGearEVA ] +#против революции + +- type: entity + id: RandomHumanoidSpawnerERTEngineerREV + parent: RandomHumanoidSpawnerERTEngineer + name: ERT engineer + suffix: REV + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: ertengineereva + - type: RandomHumanoidSpawner + settings: ERTEngineerREV + +- type: randomHumanoidSettings + id: ERTEngineerREV + parent: ERTEngineer + components: + - type: GhostRole + name: ghost-role-information-ert-engineer-name + description: ghost-role-information-ert-engineer-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ ERTEngineerGearREV ] + ## ERT Security - type: entity @@ -180,6 +236,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTSecurity + #noSpawn: true - type: randomHumanoidSettings id: ERTSecurity @@ -197,6 +254,7 @@ - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTSecurityGear ] + #noSpawn: true - type: entity id: RandomHumanoidSpawnerERTSecurityEVA @@ -221,6 +279,31 @@ - type: Loadout prototypes: [ ERTSecurityGearEVA ] +#против революции + +- type: entity + id: RandomHumanoidSpawnerERTSecurityREV + parent: RandomHumanoidSpawnerERTSecurity + name: ERT security + suffix: REV + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: ertsecurityeva + - type: RandomHumanoidSpawner + settings: ERTSecurityREV + +- type: randomHumanoidSettings + id: ERTSecurityREV + parent: ERTSecurity + components: + - type: GhostRole + name: ghost-role-information-ert-security-name + description: ghost-role-information-ert-security-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ ERTSecurityGearREV ] + ## ERT Medic - type: entity @@ -233,10 +316,11 @@ state: ertmedical - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstERTMedical # Corvax-Localization - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTMedical + #noSpawn: true - type: randomHumanoidSettings id: ERTMedical @@ -248,10 +332,11 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstERTMedical # Corvax-Localization - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTMedicalGear ] + #noSpawn: true - type: entity id: RandomHumanoidSpawnerERTMedicalEVA @@ -276,6 +361,31 @@ - type: Loadout prototypes: [ ERTMedicalGearEVA ] +#против революции + +- type: entity + id: RandomHumanoidSpawnerERTMedicalREV + parent: RandomHumanoidSpawnerERTMedical + name: ERT medic + suffix: REV + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: ertmedicaleva + - type: RandomHumanoidSpawner + settings: ERTMedicalREV + +- type: randomHumanoidSettings + id: ERTMedicalREV + parent: ERTMedical + components: + - type: GhostRole + name: ghost-role-information-ert-medical-name + description: ghost-role-information-ert-medical-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ ERTMedicalGearREV ] + ## CBURN - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 0ea539d7cc4..393dbb65d32 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -61,7 +61,7 @@ types: Heat : 0.1 #per second, scales with temperature & other constants - type: MovementSpeedModifier - baseWalkSpeed : 2.5 + baseWalkSpeed : 2.7 baseSprintSpeed : 4.5 - type: entity diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 3b3bf327769..640bd704f25 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -125,7 +125,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 25 + min: 40 - !type:OrganType type: Dwarf shouldHave: false @@ -136,7 +136,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 25 + min: 40 - !type:OrganType type: Dwarf damage: @@ -145,7 +145,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 25 + min: 15 - !type:OrganType type: Dwarf damage: @@ -156,7 +156,7 @@ conditions: - !type:ReagentThreshold reagent: Ethanol - min: 36 + min: 40 # dwarves immune to vomiting from alcohol - !type:OrganType type: Dwarf diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 105b7486814..76edb3076e5 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -27,12 +27,12 @@ - Maintenance - External - Command - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff + #special: + #- !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + #- !type:AddComponentSpecial + # components: + # - type: CommandStaff - type: startingGear id: QuartermasterGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index d742fe0ea1e..efc3ad5f0d9 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -10,7 +10,7 @@ # inverted: true # stop playing intern if you're good at engineering! requirements: - !type:OverallPlaytimeRequirement - time: 7200 #2 hrs + time: 14400 #4 hrs startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index fc5fde20e87..d37dd0bba5b 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -49,6 +49,25 @@ underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear +- type: startingGear + id: ERTLeaderGearREV + equipment: + jumpsuit: ClothingUniformJumpsuitERTLeader + back: ClothingBackpackERTLeaderFilledREV + shoes: ADTClothingShoesBootsMagERT + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTLeader + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ADTClothingBeltMilitaryWebbingRPSL_Rev + pocket1: PinpointerNuclear + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear + underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + # Engineer - type: job id: ERTEngineer @@ -101,6 +120,26 @@ underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear +- type: startingGear + id: ERTEngineerGearREV + equipment: + jumpsuit: ClothingUniformJumpsuitERTEngineer + back: ClothingBackpackERTEngineerFilledREV + shoes: ADTClothingShoesBootsMagERT + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesMeson + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTEngineer + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltChiefEngineerFilled + pocket1: PinpointerNuclear + pocket2: RemoteSignaller + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear + underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + # Security - type: job id: ERTSecurity @@ -135,6 +174,26 @@ underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear +- type: startingGear + id: ERTSecurityGearREV + equipment: + jumpsuit: ClothingUniformJumpsuitERTSecurity + back: ClothingBackpackERTSecurityFilledREV + shoes: ADTClothingShoesBootsMagERT + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTSecurity + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ADTClothingBeltMilitaryWebbingRPSSL_Rev + pocket1: PinpointerNuclear + pocket2: FlashlightSeclite + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear + underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + - type: startingGear id: ERTSecurityGearEVA equipment: @@ -209,6 +268,26 @@ underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear +- type: startingGear + id: ERTMedicalGearREV + equipment: + jumpsuit: ClothingUniformJumpsuitERTMedic + back: ClothingBackpackERTMedicalFilledREV + shoes: ADTClothingShoesBootsMagERT + mask: ClothingMaskGasERT + eyes: ClothingEyesHudMedical + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTMedical + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ADTClothingBeltMilitaryWebbingRPSML + pocket1: HandheldHealthAnalyzer + pocket2: PinpointerNuclear + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear + underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + # Janitor - type: job id: ERTJanitor diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 9fcf99c70d8..a3840d25e1c 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -262,7 +262,7 @@ ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitCBURN - shoes: ClothingShoesBootsCombatFilled + shoes: ADTClothingShoesBootsMagERT id: CBURNPDA pocket1: RadioHandheld pocket2: WeaponLaserGun diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index f0ef43c7208..6f51a6e623e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -29,12 +29,12 @@ - Maintenance - Chemistry - ChiefMedicalOfficer - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff + #special: + #- !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + #- !type:AddComponentSpecial + # components: + # - type: CommandStaff - type: startingGear id: CMOGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 5f694ec5735..1e0208afcdf 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -20,12 +20,12 @@ - Command - Maintenance - ResearchDirector - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff + #special: + #- !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + #- !type:AddComponentSpecial + # components: + # - type: CommandStaff - type: startingGear id: ResearchDirectorGear