Merge remote-tracking branch 'WD-core/master' into upstream-core

This commit is contained in:
BIGZi0348
2025-01-09 00:50:52 +03:00
22 changed files with 361 additions and 72 deletions

View File

@@ -56546,88 +56546,88 @@ entities:
pos: -156.5,-24.5
parent: 2
- type: FaxMachine
destinationAddress: Перма
name: Перма
destinationAddress: Перма
- uid: 7862
components:
- type: Transform
pos: -58.5,18.5
parent: 2
- type: FaxMachine
destinationAddress: Атмос
name: Атмос
destinationAddress: Атмос
- uid: 7863
components:
- type: Transform
pos: -19.5,0.5
parent: 2
- type: FaxMachine
destinationAddress: Глава Персонала
name: Глава Персонала
destinationAddress: Глава Персонала
- uid: 7864
components:
- type: Transform
pos: 1.5,-3.5
parent: 2
- type: FaxMachine
destinationAddress: Мостик
name: Мостик
destinationAddress: Мостик
- uid: 7865
components:
- type: Transform
pos: -68.5,-18.5
parent: 2
- type: FaxMachine
destinationAddress: Квартирмейстер
name: Квартирмейстер
destinationAddress: Квартирмейстер
- uid: 7866
components:
- type: Transform
pos: -8.5,-9.5
parent: 2
- type: FaxMachine
destinationAddress: Капитан
name: Капитан
destinationAddress: Капитан
- uid: 7867
components:
- type: Transform
pos: -61.5,3.5
parent: 2
- type: FaxMachine
destinationAddress: Старший Инженер
name: Старший Инженер
destinationAddress: Старший Инженер
- uid: 7868
components:
- type: Transform
pos: -144.5,3.5
parent: 2
- type: FaxMachine
destinationAddress: Юриспруденция
name: Юриспруденция
destinationAddress: Юриспруденция
- uid: 7869
components:
- type: Transform
pos: -163.5,8.5
parent: 2
- type: FaxMachine
destinationAddress: Смотряшка
name: Смотряшка
destinationAddress: Смотряшка
- uid: 7870
components:
- type: Transform
pos: -156.5,16.5
parent: 2
- type: FaxMachine
destinationAddress: Глава Охранной Службы
name: Глава Охранной Службы
destinationAddress: Глава Охранной Службы
- uid: 7871
components:
- type: Transform
pos: -47.5,-19.5
parent: 2
- type: FaxMachine
destinationAddress: Библиотека
name: Библиотека
destinationAddress: Библиотека
- proto: FenceMetalGate
entities:
- uid: 7872
@@ -80743,6 +80743,16 @@ entities:
- type: Transform
pos: -195.02905,1.4667006
parent: 2
- proto: HOPSpeaker
entities:
- uid: 17284
components:
- type: Transform
pos: -16.5,1.5
parent: 2
- type: DeviceLinkSink
links:
- 17285
- proto: HotplateMachineCircuitboard
entities:
- uid: 11380
@@ -92700,6 +92710,16 @@ entities:
- Pressed: Toggle
13120:
- Pressed: Toggle
- uid: 17285
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -16.466427,0.33086193
parent: 2
- type: DeviceLinkSource
linkedPorts:
17284:
- Pressed: Trigger
- proto: SignArmory
entities:
- uid: 13200
@@ -114123,18 +114143,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -149.58974,10.572603
parent: 2
- proto: WeaponRubberShotgun
entities:
- uid: 17280
components:
- type: Transform
pos: -154.60992,7.8289695
parent: 2
- uid: 17281
components:
- type: Transform
pos: -154.48492,7.495636
parent: 2
- proto: WeaponRevolverMateba
entities:
- uid: 11349
@@ -114175,6 +114183,18 @@ entities:
parent: 2
- type: Gun
fireRate: 6.5
- proto: WeaponRubberShotgun
entities:
- uid: 17280
components:
- type: Transform
pos: -154.60992,7.8289695
parent: 2
- uid: 17281
components:
- type: Transform
pos: -154.48492,7.495636
parent: 2
- proto: WeaponShotgunEnforcer
entities:
- uid: 16804

View File

@@ -11658,7 +11658,7 @@ entities:
pos: 23.5,13.5
parent: 2
- type: Door
secondsUntilStateChange: -13437.97
secondsUntilStateChange: -13636.046
state: Opening
- proto: AirlockExternalGlassShuttleCargo
entities:
@@ -13425,12 +13425,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 23.5,1.5
parent: 2
- uid: 13024
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -13.5,2.5
parent: 2
- uid: 13025
components:
- type: Transform
@@ -75279,6 +75273,17 @@ entities:
- type: Transform
pos: -45.404816,2.6740484
parent: 2
- proto: HOPSpeaker
entities:
- uid: 13024
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -13.5,2.5
parent: 2
- type: DeviceLinkSink
links:
- 16330
- proto: HospitalCurtainsOpen
entities:
- uid: 6375
@@ -83055,7 +83060,7 @@ entities:
- type: Transform
parent: 14573
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -83064,7 +83069,7 @@ entities:
- type: Transform
parent: 14573
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -83073,7 +83078,7 @@ entities:
- type: Transform
parent: 14634
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -83082,7 +83087,7 @@ entities:
- type: Transform
parent: 14634
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -83091,7 +83096,7 @@ entities:
- type: Transform
parent: 6372
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -83100,7 +83105,7 @@ entities:
- type: Transform
parent: 6372
- type: RCDAmmo
charges: 150
charges: 225
- type: Physics
canCollide: False
- type: InsideEntityStorage
@@ -86945,6 +86950,16 @@ entities:
- Pressed: Toggle
15194:
- Pressed: Toggle
- uid: 16330
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.532192,3.6885402
parent: 2
- type: DeviceLinkSource
linkedPorts:
13024:
- Pressed: Trigger
- proto: SignalButtonWindows
entities:
- uid: 13356
@@ -106899,18 +106914,6 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: WeaponRubberShotgun
entities:
- uid: 14524
components:
- type: Transform
pos: 3.4590678,15.842787
parent: 2
- uid: 14531
components:
- type: Transform
pos: 3.4746928,15.608412
parent: 2
- proto: WeaponRifleAk
entities:
- uid: 8783
@@ -106936,6 +106939,18 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: WeaponRubberShotgun
entities:
- uid: 14524
components:
- type: Transform
pos: 3.4590678,15.842787
parent: 2
- uid: 14531
components:
- type: Transform
pos: 3.4746928,15.608412
parent: 2
- proto: WeaponShotgunHandmade
entities:
- uid: 12244
@@ -107123,7 +107138,7 @@ entities:
pos: -6.5,-20.5
parent: 2
- type: Door
secondsUntilStateChange: -98991.91
secondsUntilStateChange: -99189.984
state: Opening
- proto: WindoorAssembly
entities: