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

Map Edits: Arena, Hive, Hammurabi #2357

Merged
merged 5 commits into from
Dec 12, 2024
Merged

Map Edits: Arena, Hive, Hammurabi #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dbc642
Map Edits: Arena, Hive, Hammurabi
BurningRash Dec 4, 2024
f944947
Fix disconnected vent
BurningRash Dec 4, 2024
89e181a
How!?
BurningRash Dec 4, 2024
c1eba57
Merge remote-tracking branch 'upstream/master' into ThreeMapEdits
BurningRash Dec 7, 2024
46ec9c9
add superweapon spawners
BurningRash Dec 7, 2024
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
168 changes: 97 additions & 71 deletions Resources/Maps/arena.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14477,6 +14477,18 @@ entities:
- type: Transform
pos: -52.5,-18.5
parent: 6747
- proto: AirlockExternalGlassShuttleEmergencyLocked
entities:
- uid: 1082
components:
- type: Transform
pos: 71.5,-54.5
parent: 6747
- uid: 1083
components:
- type: Transform
pos: 69.5,-54.5
parent: 6747
- proto: AirlockExternalGlassShuttleEscape
entities:
- uid: 1129
Expand Down Expand Up @@ -15052,16 +15064,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 5.5,42.5
parent: 6747
- uid: 1082
components:
- type: Transform
pos: 69.5,-54.5
parent: 6747
- uid: 1083
components:
- type: Transform
pos: 71.5,-54.5
parent: 6747
- uid: 1130
components:
- type: Transform
Expand Down Expand Up @@ -18730,10 +18732,10 @@ entities:
parent: 6747
- proto: BannerCargo
entities:
- uid: 22333
- uid: 29443
components:
- type: Transform
pos: 26.5,13.5
pos: 23.5,11.5
parent: 6747
- proto: BannerEngineering
entities:
Expand Down Expand Up @@ -61270,6 +61272,11 @@ entities:
rot: 1.5707963267948966 rad
pos: 14.5,18.5
parent: 6747
- uid: 1835
components:
- type: Transform
pos: 26.5,13.5
parent: 6747
- uid: 6649
components:
- type: Transform
Expand Down Expand Up @@ -62545,6 +62552,13 @@ entities:
- 0
- 0
- 0
- proto: CrateFreezer
entities:
- uid: 29444
components:
- type: Transform
pos: 11.5,-34.5
parent: 6747
- proto: CrateFunBoardGames
entities:
- uid: 12164
Expand Down Expand Up @@ -75244,6 +75258,17 @@ entities:
- type: Transform
pos: -35.50642,-44.938274
parent: 6747
- type: SolutionContainerManager
solutions:
drink:
temperature: 293.15
canReact: True
maxVol: 20
name: null
reagents:
- data: null
ReagentId: Champagne
Quantity: 18
- proto: DrinkGrapeCan
entities:
- uid: 9492
Expand Down Expand Up @@ -126176,6 +126201,13 @@ entities:
- type: Transform
pos: -35.43267,-48.272682
parent: 6747
- proto: IntercomAll
entities:
- uid: 1840
components:
- type: Transform
pos: -75.5,-69.5
parent: 6747
- proto: IntercomCommand
entities:
- uid: 29204
Expand All @@ -126195,20 +126227,11 @@ entities:
- type: Transform
pos: -44.487347,-39.534794
parent: 6747
- proto: IntercomEngineering
entities:
- uid: 29205
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -75.5,-69.5
parent: 6747
- proto: IntercomScience
entities:
- uid: 29206
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -74.5,-70.5
parent: 6747
- proto: IntercomSecurity
Expand All @@ -126226,7 +126249,6 @@ entities:
- uid: 27081
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -14.5,3.5
parent: 6747
- uid: 27082
Expand All @@ -126237,7 +126259,6 @@ entities:
- uid: 27083
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -41.5,-2.5
parent: 6747
- proto: JanitorialTrolley
Expand Down Expand Up @@ -127656,6 +127677,13 @@ entities:
- type: Transform
pos: -61.5,-68.5
parent: 6747
- proto: LootSpawnerSecuritySuperweapon
entities:
- uid: 3469
components:
- type: Transform
pos: -31.5,10.5
parent: 6747
- proto: Machete
entities:
- uid: 4834
Expand Down Expand Up @@ -128317,7 +128345,7 @@ entities:
- uid: 4036
components:
- type: Transform
pos: -35.674225,-47.724026
pos: -35.652367,-47.82449
parent: 6747
- proto: MaterialDurathread
entities:
Expand Down Expand Up @@ -157263,11 +157291,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 4.5,-40.5
parent: 6747
- uid: 6569
components:
- type: Transform
pos: 70.49715,-48.17924
parent: 6747
- uid: 6852
components:
- type: Transform
Expand Down Expand Up @@ -158076,6 +158099,14 @@ entities:
rot: 1.5707963267948966 rad
pos: 5.5,-7.5
parent: 6747
- proto: SignShipDock
entities:
- uid: 6569
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 70.5,-48.5
parent: 6747
- proto: SignSpace
entities:
- uid: 6100
Expand Down Expand Up @@ -184523,13 +184554,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -28.606861,-9.540937
parent: 6747
- proto: WeaponLauncherRocket
entities:
- uid: 3469
components:
- type: Transform
pos: -31.493519,10.543685
parent: 6747
- proto: WeaponRifleM90GrenadeLauncher
entities:
- uid: 8311
Expand Down Expand Up @@ -184898,6 +184922,18 @@ entities:
rot: 1.5707963267948966 rad
pos: -39.5,8.5
parent: 6747
- uid: 3355
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 38.5,-32.5
parent: 6747
- uid: 3356
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 38.5,-33.5
parent: 6747
- uid: 3870
components:
- type: Transform
Expand Down Expand Up @@ -184925,18 +184961,6 @@ entities:
- type: Transform
pos: -43.5,0.5
parent: 6747
- uid: 8736
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 38.5,-32.5
parent: 6747
- uid: 8738
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 38.5,-33.5
parent: 6747
- uid: 8739
components:
- type: Transform
Expand Down Expand Up @@ -185059,18 +185083,6 @@ entities:
parent: 6747
- proto: WindoorSecureCommandLocked
entities:
- uid: 3355
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 38.5,-32.5
parent: 6747
- uid: 3356
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 38.5,-33.5
parent: 6747
- uid: 3966
components:
- type: Transform
Expand Down Expand Up @@ -185125,6 +185137,20 @@ entities:
rot: 1.5707963267948966 rad
pos: 42.5,11.5
parent: 6747
- proto: WindoorSecureHeadOfPersonnelLocked
entities:
- uid: 8736
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 38.5,-32.5
parent: 6747
- uid: 8738
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 38.5,-33.5
parent: 6747
- proto: WindoorSecureJanitorLocked
entities:
- uid: 2282
Expand Down Expand Up @@ -185241,6 +185267,17 @@ entities:
rot: -1.5707963267948966 rad
pos: -8.5,-44.5
parent: 6747
- uid: 22333
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-41.5
parent: 6747
- uid: 29205
components:
- type: Transform
pos: -10.5,-43.5
parent: 6747
- proto: WindoorSecureSecurityLocked
entities:
- uid: 139
Expand Down Expand Up @@ -185293,12 +185330,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.5,-5.5
parent: 6747
- uid: 1840
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-41.5
parent: 6747
- uid: 2708
components:
- type: Transform
Expand Down Expand Up @@ -186839,11 +186870,6 @@ entities:
- type: Transform
pos: -9.5,-43.5
parent: 6747
- uid: 1835
components:
- type: Transform
pos: -10.5,-43.5
parent: 6747
- uid: 1836
components:
- type: Transform
Expand Down
Loading
Loading