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.

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

Evacs update #2715

Merged
merged 2 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2,681 changes: 0 additions & 2,681 deletions Resources/Maps/Shuttles/arrivals_corvaxsilly.yml

This file was deleted.

1,331 changes: 682 additions & 649 deletions Resources/Maps/Shuttles/corvax_emergency.yml

Large diffs are not rendered by default.

7,044 changes: 3,440 additions & 3,604 deletions Resources/Maps/Shuttles/emergency_corvaxavrite.yml

Large diffs are not rendered by default.

6,910 changes: 3,319 additions & 3,591 deletions Resources/Maps/Shuttles/emergency_corvaxdelta.yml

Large diffs are not rendered by default.

134 changes: 16 additions & 118 deletions Resources/Maps/Shuttles/emergency_corvaxpaper.yml

Large diffs are not rendered by default.

24 changes: 10 additions & 14 deletions Resources/Maps/Shuttles/emergency_corvaxsilly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ entities:
name: Crappy PR-148
- type: Transform
pos: -3.7901773,-19.785557
parent: 6
parent: invalid
- type: MapGrid
chunks:
0,0:
Expand Down Expand Up @@ -238,18 +238,6 @@ entities:
- type: RadiationGridResistance
- type: PreventPilot
- type: ProtectedGrid
- uid: 6
components:
- type: MetaData
name: map 100
- type: Transform
- type: Map
- type: PhysicsMap
- type: GridTree
- type: MovedGrids
- type: Broadphase
- type: OccluderTree
- type: LoadedMap
- proto: AirlockBarGlassLocked
entities:
- uid: 26
Expand Down Expand Up @@ -1162,7 +1150,15 @@ entities:
- type: Transform
pos: -3.5,-2.5
parent: 1
- proto: soda_dispenser
- proto: Screen
entities:
- uid: 6
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -4.5,3.5
parent: 1
- proto: SodaDispenser
entities:
- uid: 155
components:
Expand Down
47 changes: 33 additions & 14 deletions Resources/Maps/Shuttles/emergency_maus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ entities:
name: EVAC - "Der Zug"- NT533
- type: Transform
pos: -25,-25
parent: 2
parent: invalid
- type: MapGrid
chunks:
0,2:
Expand Down Expand Up @@ -1106,19 +1106,6 @@ entities:
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
- uid: 2
components:
- type: MetaData
name: Map Entity
- type: Transform
- type: Map
mapPaused: True
- type: PhysicsMap
- type: GridTree
- type: MovedGrids
- type: Broadphase
- type: OccluderTree
- type: LoadedMap
- proto: AirAlarm
entities:
- uid: 463
Expand Down Expand Up @@ -4747,6 +4734,38 @@ entities:
- type: Transform
pos: 11.5,27.5
parent: 1
- proto: Screen
entities:
- uid: 2
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,6.5
parent: 1
- uid: 845
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,6.5
parent: 1
- uid: 846
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,14.5
parent: 1
- uid: 847
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,14.5
parent: 1
- uid: 848
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 6.5,25.5
parent: 1
- proto: ShuttleWindow
entities:
- uid: 60
Expand Down
64 changes: 46 additions & 18 deletions Resources/Maps/Shuttles/emergency_pilgrim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1000,17 +1000,13 @@ entities:
- type: Transform
pos: 3.5,5.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- proto: AirCanister
entities:
- uid: 580
components:
- type: Transform
pos: -2.5,-12.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- proto: AirlockCommandGlassLocked
entities:
- uid: 413
Expand Down Expand Up @@ -4487,7 +4483,7 @@ entities:
rot: 1.5707963267948966 rad
pos: 3.311915,-8.600292
parent: 1
- proto: FoodMeatKebab
- proto: FoodKebabSkewer
entities:
- uid: 597
components:
Expand Down Expand Up @@ -4980,8 +4976,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -2.5,-12.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- proto: GasVentPump
Expand All @@ -4992,26 +4986,20 @@ entities:
rot: -1.5707963267948966 rad
pos: 0.5,0.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- uid: 513
components:
- type: Transform
pos: -7.5,6.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- uid: 514
components:
- type: Transform
pos: 0.5,13.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- uid: 515
Expand All @@ -5020,8 +5008,6 @@ entities:
rot: 3.141592653589793 rad
pos: 6.5,-13.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- uid: 516
Expand All @@ -5030,8 +5016,6 @@ entities:
rot: 3.141592653589793 rad
pos: -5.5,-13.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- type: AtmosPipeColor
color: '#0000FFFF'
- proto: GravityGeneratorMini
Expand Down Expand Up @@ -5645,6 +5629,50 @@ entities:
- type: Transform
pos: -3.5,10.5
parent: 1
- proto: Screen
entities:
- uid: 861
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -9.5,-7.5
parent: 1
- uid: 862
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 10.5,-7.5
parent: 1
- uid: 863
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 10.5,0.5
parent: 1
- uid: 864
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -9.5,0.5
parent: 1
- uid: 865
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,5.5
parent: 1
- uid: 866
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -2.5,12.5
parent: 1
- uid: 867
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,-11.5
parent: 1
- proto: ShuttleWindow
entities:
- uid: 71
Expand Down Expand Up @@ -5783,7 +5811,7 @@ entities:
rot: -1.5707963267948966 rad
pos: 3.5,18.5
parent: 1
- proto: soda_dispenser
- proto: SodaDispenser
entities:
- uid: 427
components:
Expand Down
Loading