Skip to content

Fix master + prototypes #8772

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

Merged
metalgearsloth merged 1 commit into from
Jun 12, 2022
Merged

Fix master + prototypes #8772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 changes: 1 addition & 1 deletion Resources/Maps/Salvage/cargo-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ entities:
- canCollide: False
type: Physics
- uid: 62
type: APCBasic
type: BaseAPC
components:
- pos: 1.5,0.5
parent: 20
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Salvage/medium-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@ entities:
- canCollide: False
type: Physics
- uid: 114
type: APCBasic
type: BaseAPC
components:
- pos: 1.5,2.5
parent: 0
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Salvage/medium-pet-hospital.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ entities:
- canCollide: False
type: Physics
- uid: 145
type: APCBasic
type: BaseAPC
components:
- name: bear outpost APC
type: MetaData
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Salvage/medium-pirate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ entities:
parent: 52
type: Transform
- uid: 99
type: APCBasic
type: BaseAPC
components:
- pos: -0.5,1.5
parent: 52
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Salvage/ruin-cargo-salvage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3491,7 +3491,7 @@ entities:
- canCollide: False
type: Physics
- uid: 513
type: APCBasic
type: BaseAPC
components:
- rot: -1.5707963267948966 rad
pos: 7.5,-0.5
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Salvage/small-4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ entities:
- canCollide: False
type: Physics
- uid: 53
type: APCBasic
type: BaseAPC
components:
- pos: -0.5,-3.5
parent: 0
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/Test/singularity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ entities:
pos: 3.5,16.5
type: Transform
- uid: 149
type: APCBasic
type: BaseAPC
components:
- parent: 0
pos: 3.5,17.5
Expand Down
40 changes: 20 additions & 20 deletions Resources/Maps/atlas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13831,7 +13831,7 @@ entities:
parent: 30
type: Transform
- uid: 747
type: APCBasic
type: BaseAPC
components:
- pos: 12.5,20.5
parent: 30
Expand Down Expand Up @@ -15219,7 +15219,7 @@ entities:
- canCollide: False
type: Physics
- uid: 893
type: APCBasic
type: BaseAPC
components:
- pos: -2.5,14.5
parent: 30
Expand Down Expand Up @@ -22089,19 +22089,19 @@ entities:
parent: 30
type: Transform
- uid: 1702
type: APCBasic
type: BaseAPC
components:
- pos: 32.5,5.5
parent: 30
type: Transform
- uid: 1703
type: APCBasic
type: BaseAPC
components:
- pos: 24.5,4.5
parent: 30
type: Transform
- uid: 1704
type: APCBasic
type: BaseAPC
components:
- pos: 26.5,-0.5
parent: 30
Expand Down Expand Up @@ -23031,19 +23031,19 @@ entities:
- fixtures: []
type: Fixtures
- uid: 1799
type: APCBasic
type: BaseAPC
components:
- pos: 20.5,25.5
parent: 30
type: Transform
- uid: 1800
type: APCBasic
type: BaseAPC
components:
- pos: 24.5,17.5
parent: 30
type: Transform
- uid: 1801
type: APCBasic
type: BaseAPC
components:
- rot: 1.5707963267948966 rad
pos: 13.5,7.5
Expand Down Expand Up @@ -25101,7 +25101,7 @@ entities:
- canCollide: False
type: Physics
- uid: 2017
type: APCBasic
type: BaseAPC
components:
- pos: -12.5,17.5
parent: 30
Expand Down Expand Up @@ -28475,7 +28475,7 @@ entities:
parent: 30
type: Transform
- uid: 2404
type: APCBasic
type: BaseAPC
components:
- pos: 2.5,-10.5
parent: 30
Expand Down Expand Up @@ -29467,7 +29467,7 @@ entities:
parent: 30
type: Transform
- uid: 2524
type: APCBasic
type: BaseAPC
components:
- pos: 13.5,0.5
parent: 30
Expand Down Expand Up @@ -34925,7 +34925,7 @@ entities:
- fixtures: []
type: Fixtures
- uid: 3101
type: APCBasic
type: BaseAPC
components:
- pos: 17.5,-13.5
parent: 30
Expand Down Expand Up @@ -43520,7 +43520,7 @@ entities:
- canCollide: False
type: Physics
- uid: 3890
type: APCBasic
type: BaseAPC
components:
- rot: -1.5707963267948966 rad
pos: -13.5,3.5
Expand Down Expand Up @@ -52270,7 +52270,7 @@ entities:
- canCollide: False
type: Physics
- uid: 4904
type: APCBasic
type: BaseAPC
components:
- pos: -24.5,-11.5
parent: 30
Expand Down Expand Up @@ -52368,7 +52368,7 @@ entities:
- fixtures: []
type: Fixtures
- uid: 4917
type: APCBasic
type: BaseAPC
components:
- pos: -24.5,-17.5
parent: 30
Expand Down Expand Up @@ -58567,7 +58567,7 @@ entities:
- fixtures: []
type: Fixtures
- uid: 5641
type: APCBasic
type: BaseAPC
components:
- rot: 1.5707963267948966 rad
pos: -24.5,18.5
Expand Down Expand Up @@ -62852,7 +62852,7 @@ entities:
- fixtures: []
type: Fixtures
- uid: 6136
type: APCBasic
type: BaseAPC
components:
- pos: -30.5,18.5
parent: 30
Expand Down Expand Up @@ -64439,7 +64439,7 @@ entities:
Toggle: []
type: SignalReceiver
- uid: 6290
type: APCBasic
type: BaseAPC
components:
- pos: -34.5,-8.5
parent: 30
Expand Down Expand Up @@ -68746,13 +68746,13 @@ entities:
parent: 30
type: Transform
- uid: 6729
type: APCBasic
type: BaseAPC
components:
- pos: -43.5,7.5
parent: 30
type: Transform
- uid: 6730
type: APCBasic
type: BaseAPC
components:
- pos: -33.5,7.5
parent: 30
Expand Down
Loading