Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Evac fixes #2525

Merged
merged 7 commits into from
Jan 1, 2025
Merged

Evac fixes #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0c3ac8
Map Edits: Evac Shuttle Updates
BurningRash Dec 26, 2024
a5df077
timer
BurningRash Dec 26, 2024
2d26280
metadata
BurningRash Dec 26, 2024
4f1c983
more meta
BurningRash Dec 26, 2024
a3f4ce4
meerup
BurningRash Dec 26, 2024
a7c4d61
holopads
BurningRash Dec 26, 2024
b86dd4c
merge master
Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 77 additions & 76 deletions Resources/Maps/_DV/Shuttles/NTES_BC20.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ entities:
- uid: 1
components:
- type: MetaData
name: NTES BC20
- type: Transform
pos: 0.5104167,0.43224397
parent: invalid
Expand Down Expand Up @@ -75,10 +76,10 @@ entities:
gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg
- type: DeviceNetwork
deviceNetId: Wireless
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down Expand Up @@ -682,107 +683,107 @@ entities:
- type: Transform
pos: 9.5,-17.5
parent: 1
- proto: AirlockGlass
- proto: AirlockExternalGlassShuttleLocked
entities:
- uid: 581
- uid: 164
components:
- type: Transform
pos: -9.5,-16.5
rot: 1.5707963267948966 rad
pos: 12.5,-16.5
parent: 1
- uid: 590
- uid: 165
components:
- type: Transform
pos: 7.5,-16.5
rot: 1.5707963267948966 rad
pos: 12.5,-24.5
parent: 1
- uid: 1046
- uid: 306
components:
- type: Transform
pos: -6.5,-24.5
rot: -1.5707963267948966 rad
pos: -14.5,-16.5
parent: 1
- uid: 1048
- uid: 314
components:
- type: Transform
pos: -6.5,-25.5
rot: -1.5707963267948966 rad
pos: -14.5,-26.5
parent: 1
- uid: 1049
- uid: 716
components:
- type: Transform
pos: 4.5,-25.5
rot: -1.5707963267948966 rad
pos: -14.5,-18.5
parent: 1
- uid: 1050
- uid: 1308
components:
- type: Transform
pos: 4.5,-24.5
rot: 1.5707963267948966 rad
pos: 12.5,-18.5
parent: 1
- uid: 1054
- uid: 1311
components:
- type: Transform
pos: -4.5,-12.5
rot: -1.5707963267948966 rad
pos: -14.5,-24.5
parent: 1
- uid: 1055
- uid: 1353
components:
- type: Transform
pos: -4.5,-13.5
rot: 1.5707963267948966 rad
pos: 12.5,-26.5
parent: 1
- uid: 1056
- proto: AirlockGlass
entities:
- uid: 581
components:
- type: Transform
pos: 2.5,-12.5
pos: -9.5,-16.5
parent: 1
- uid: 1057
- uid: 590
components:
- type: Transform
pos: 2.5,-13.5
pos: 7.5,-16.5
parent: 1
- proto: AirlockGlassShuttle
entities:
- uid: 164
- uid: 1046
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-18.5
pos: -6.5,-24.5
parent: 1
- uid: 165
- uid: 1048
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-16.5
pos: -6.5,-25.5
parent: 1
- uid: 314
- uid: 1049
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-26.5
pos: 4.5,-25.5
parent: 1
- uid: 360
- uid: 1050
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-24.5
pos: 4.5,-24.5
parent: 1
- uid: 760
- uid: 1054
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-18.5
pos: -4.5,-12.5
parent: 1
- uid: 821
- uid: 1055
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-24.5
pos: -4.5,-13.5
parent: 1
- uid: 930
- uid: 1056
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-26.5
pos: 2.5,-12.5
parent: 1
- uid: 1353
- uid: 1057
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-16.5
pos: 2.5,-13.5
parent: 1
- proto: AirlockMedicalGlassLocked
entities:
Expand Down Expand Up @@ -855,50 +856,50 @@ entities:
- uid: 222
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-18.5
rot: -1.5707963267948966 rad
pos: -14.5,-24.5
parent: 1
- uid: 301
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-18.5
pos: -14.5,-16.5
parent: 1
- uid: 303
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-16.5
rot: 1.5707963267948966 rad
pos: 12.5,-18.5
parent: 1
- uid: 306
- uid: 360
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-24.5
rot: 1.5707963267948966 rad
pos: 12.5,-26.5
parent: 1
- uid: 716
- uid: 760
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-24.5
rot: -1.5707963267948966 rad
pos: -14.5,-18.5
parent: 1
- uid: 1308
- uid: 821
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -14.5,-26.5
parent: 1
- uid: 1311
- uid: 930
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-16.5
parent: 1
- uid: 1639
- uid: 1310
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-26.5
pos: 12.5,-24.5
parent: 1
- proto: AtmosFixNitrogenMarker
entities:
Expand Down Expand Up @@ -5920,6 +5921,12 @@ entities:
- type: Transform
pos: -3.5,-34.5
parent: 1
- uid: 884
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,-39.5
parent: 1
- proto: GasPipeBend
entities:
- uid: 858
Expand Down Expand Up @@ -8092,12 +8099,6 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 884
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,-39.5
parent: 1
- uid: 993
components:
- type: Transform
Expand Down Expand Up @@ -8974,6 +8975,13 @@ entities:
- type: Transform
pos: -1.0302026,-5.3806286
parent: 1
- proto: HolopadCentCommEvacShuttle
entities:
- uid: 1639
components:
- type: Transform
pos: -0.5,6.5
parent: 1
- proto: HospitalCurtainsOpen
entities:
- uid: 1301
Expand Down Expand Up @@ -9427,13 +9435,6 @@ entities:
parent: 1
- type: ApcPowerReceiver
powerLoad: 0
- uid: 1310
components:
- type: Transform
pos: 5.5,-34.5
parent: 1
- type: ApcPowerReceiver
powerLoad: 0
- uid: 1312
components:
- type: Transform
Expand Down
16 changes: 15 additions & 1 deletion Resources/Maps/_DV/Shuttles/NTES_Centipede.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ entities:
gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg
- type: DeviceNetwork
deviceNetId: Wireless
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down Expand Up @@ -5358,6 +5358,13 @@ entities:
- type: Transform
pos: -14.386516,-29.520695
parent: 1
- proto: DefibrillatorCabinetFilled
entities:
- uid: 1509
components:
- type: Transform
pos: -8.5,-1.5
parent: 1
- proto: DisposalBend
entities:
- uid: 713
Expand Down Expand Up @@ -10759,6 +10766,13 @@ entities:
- type: Transform
pos: -10.532349,-3.2752516
parent: 1
- proto: HolopadCentCommEvacShuttle
entities:
- uid: 1510
components:
- type: Transform
pos: -10.5,16.5
parent: 1
- proto: HospitalCurtainsOpen
entities:
- uid: 1561
Expand Down
Loading
Loading