diff --git a/Resources/Maps/Shuttles/ERT/red.yml b/Resources/Maps/Shuttles/ERT/red.yml index 4b21c72fdf1b0..10538cfee17ca 100644 --- a/Resources/Maps/Shuttles/ERT/red.yml +++ b/Resources/Maps/Shuttles/ERT/red.yml @@ -4,8 +4,8 @@ meta: engineVersion: 267.2.0 forkId: "" forkVersion: "" - time: 12/27/2025 23:01:02 - entityCount: 745 + time: 02/08/2026 14:09:31 + entityCount: 746 maps: [] grids: - 1 @@ -1948,13 +1948,6 @@ entities: 414: - - MedicalScannerSender - MedicalScannerReceiver -- proto: ComputerComms - entities: - - uid: 208 - components: - - type: Transform - pos: 1.5,4.5 - parent: 1 - proto: ComputerRadar entities: - uid: 209 @@ -2093,6 +2086,20 @@ entities: - type: Transform pos: 3.5,-10.5 parent: 1 +- proto: ErtComputerShuttle + entities: + - uid: 208 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 +- proto: ErtSpawnPoint + entities: + - uid: 746 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 - proto: FireAlarm entities: - uid: 247 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 7fe0c0a98d5f2..7e9494a310543 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -17,10 +17,10 @@ - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14. modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. - Heat: 0.80 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Heat: 0.7 # DS14 - type: ExplosionResistance damageCoefficient: 0.90 diff --git a/Resources/Prototypes/_DeadSpace/CustomizableHumanoidSpawner/centcomm/official.yml b/Resources/Prototypes/_DeadSpace/CustomizableHumanoidSpawner/centcomm/official.yml index e9c489637ac50..4a1aafb8c87c4 100644 --- a/Resources/Prototypes/_DeadSpace/CustomizableHumanoidSpawner/centcomm/official.yml +++ b/Resources/Prototypes/_DeadSpace/CustomizableHumanoidSpawner/centcomm/official.yml @@ -59,7 +59,7 @@ outerClothing: ClothingOuterArmorCentcommCarapace shoes: ClothingShoesBootsLaceup mask: ClothingMaskGasCentcom - id: CentcomAdministratorPDA + id: CentcomOfficialPDA storage: back: - PhoneInstrument diff --git a/Resources/Prototypes/_DeadSpace/ERT/console.yml b/Resources/Prototypes/_DeadSpace/ERT/console.yml index e16a26dec0bdf..8ad3cafc383e9 100644 --- a/Resources/Prototypes/_DeadSpace/ERT/console.yml +++ b/Resources/Prototypes/_DeadSpace/ERT/console.yml @@ -41,6 +41,7 @@ - Cburn - CburnSierra - Gamma + - Red - Amber - Engineers - BSAA diff --git a/Resources/Prototypes/_DeadSpace/ERT/ert_team.yml b/Resources/Prototypes/_DeadSpace/ERT/ert_team.yml index f8b073074866d..e0ddd47d9afa4 100644 --- a/Resources/Prototypes/_DeadSpace/ERT/ert_team.yml +++ b/Resources/Prototypes/_DeadSpace/ERT/ert_team.yml @@ -152,7 +152,7 @@ необходимым оборудованием для выполнения их миссии. Время прибытия отряда от 10 до 15 минут. sender: ert-responce-cso-sender - rule: SpawnGammaShuttle # это буквально одинаковые шаттлы + rule: SpawnRedShuttle cooldown: min: 10m max: 10m diff --git a/Resources/Prototypes/_DeadSpace/ERT/rules.yml b/Resources/Prototypes/_DeadSpace/ERT/rules.yml index 79bc17465ddde..9bcfa32d5b2d9 100644 --- a/Resources/Prototypes/_DeadSpace/ERT/rules.yml +++ b/Resources/Prototypes/_DeadSpace/ERT/rules.yml @@ -10,7 +10,7 @@ id: SpawnRedShuttle components: - type: ErtSpawnRule - shuttle: AmberShuttle + shuttle: RedShuttle - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/_DeadSpace/ERT/shuttles_grids.yml b/Resources/Prototypes/_DeadSpace/ERT/shuttles_grids.yml index cfaef8c7193c8..2160a1ea5fc26 100644 --- a/Resources/Prototypes/_DeadSpace/ERT/shuttles_grids.yml +++ b/Resources/Prototypes/_DeadSpace/ERT/shuttles_grids.yml @@ -16,6 +16,10 @@ id: AmberShuttle path: /Maps/Shuttles/ERT/amber.yml +- type: ertShuttle + id: RedShuttle + path: /Maps/Shuttles/ERT/red.yml + - type: ertShuttle id: GammaShuttle path: /Maps/Shuttles/ERT/gamma.yml diff --git a/Resources/Prototypes/_DeadSpace/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DeadSpace/Entities/Objects/Devices/pda.yml index 143ac52e6112c..da3d8a40b4aa9 100644 --- a/Resources/Prototypes/_DeadSpace/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DeadSpace/Entities/Objects/Devices/pda.yml @@ -134,6 +134,7 @@ - NotekeeperCartridge - NewsReaderCartridge - AstroNavCartridge + - NanoTaskCartridge - type: entity parent: BasePDA