Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix saltern (#16151)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-06 18:26:24 +10:00
committed by GitHub
parent 0906a4b912
commit 7695988029
2 changed files with 19 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

471
Resources/Maps/saltern.yml
View File

@@ -171,8 +171,7 @@ entities:
fixedRotation: False fixedRotation: False
bodyType: Dynamic bodyType: Dynamic
type: Physics type: Physics
- fixtures: []
type: Fixtures
- id: Saltern - id: Saltern
type: BecomesStation type: BecomesStation
- version: 2 - version: 2
@@ -2841,84 +2840,13 @@ entities:
pos: -41.5,-11.5 pos: -41.5,-11.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 100
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- uid: 8020 - uid: 8020
components: components:
- rot: -1.5707963267948966 rad - rot: -1.5707963267948966 rad
pos: -41.5,-9.5 pos: -41.5,-9.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 100
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- proto: AirlockExternalGlassShuttleEmergencyLocked - proto: AirlockExternalGlassShuttleEmergencyLocked
entities: entities:
- uid: 9377 - uid: 9377
@@ -2927,168 +2855,24 @@ entities:
pos: -44.5,8.5 pos: -44.5,8.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- uid: 9388 - uid: 9388
components: components:
- rot: -1.5707963267948966 rad - rot: -1.5707963267948966 rad
pos: -44.5,2.5 pos: -44.5,2.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- uid: 9391 - uid: 9391
components: components:
- rot: -1.5707963267948966 rad - rot: -1.5707963267948966 rad
pos: -44.5,10.5 pos: -44.5,10.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- uid: 9392 - uid: 9392
components: components:
- rot: -1.5707963267948966 rad - rot: -1.5707963267948966 rad
pos: -44.5,0.5 pos: -44.5,0.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- proto: AirlockExternalGlassShuttleEscape - proto: AirlockExternalGlassShuttleEscape
entities: entities:
- uid: 7579 - uid: 7579
@@ -3097,84 +2881,12 @@ entities:
pos: 41.5,-13.5 pos: 41.5,-13.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 100
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- uid: 8311 - uid: 8311
components: components:
- rot: 3.141592653589793 rad - rot: 3.141592653589793 rad
pos: -35.5,-20.5 pos: -35.5,-20.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 100
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- proto: AirlockExternalGlassShuttleLocked - proto: AirlockExternalGlassShuttleLocked
entities: entities:
- uid: 1771 - uid: 1771
@@ -3183,42 +2895,6 @@ entities:
pos: 21.5,22.5 pos: 21.5,22.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
- -0.49,-0.49
mask:
- Impassable
- MidImpassable
- HighImpassable
- LowImpassable
- InteractImpassable
layer:
- MidImpassable
- HighImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: null
- shape: !type:PhysShapeCircle
radius: 0.2
position: 0,-0.5
mask: []
layer: []
density: 1
hard: False
restitution: 0
friction: 0.4
id: docking
type: Fixtures
- proto: AirlockExternalLocked - proto: AirlockExternalLocked
entities: entities:
- uid: 440 - uid: 440
@@ -19580,8 +19256,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 4328 - uid: 4328
components: components:
- rot: 1.5707963267948966 rad - rot: 1.5707963267948966 rad
@@ -19590,8 +19265,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 6289 - uid: 6289
components: components:
- rot: 1.5707963267948966 rad - rot: 1.5707963267948966 rad
@@ -19600,8 +19274,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 6414 - uid: 6414
components: components:
- pos: 40.5,6.5 - pos: 40.5,6.5
@@ -19609,8 +19282,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 6930 - uid: 6930
components: components:
- pos: 42.5,6.5 - pos: 42.5,6.5
@@ -19618,8 +19290,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 6941 - uid: 6941
components: components:
- pos: 41.5,6.5 - pos: 41.5,6.5
@@ -19627,8 +19298,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 8573 - uid: 8573
components: components:
- rot: 3.141592653589793 rad - rot: 3.141592653589793 rad
@@ -19637,8 +19307,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- proto: CaptainIDCard - proto: CaptainIDCard
entities: entities:
- uid: 3367 - uid: 3367
@@ -23758,27 +23427,6 @@ entities:
- pos: -7.5,-8.5 - pos: -7.5,-8.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- MidImpassable
- LowImpassable
layer:
- BulletImpassable
- Opaque
density: 145
hard: True
restitution: 0
friction: 0.4
id: null
type: Fixtures
- open: True - open: True
removedMasks: 20 removedMasks: 20
type: EntityStorage type: EntityStorage
@@ -29754,22 +29402,19 @@ entities:
- pos: 17.5,-0.5 - pos: 17.5,-0.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures: []
type: Fixtures
- uid: 9109 - uid: 9109
components: components:
- pos: -11.5,-4.5 - pos: -11.5,-4.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures: []
type: Fixtures
- uid: 9110 - uid: 9110
components: components:
- pos: -21.5,9.5 - pos: -21.5,9.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures: []
type: Fixtures
- proto: FloorTileItemArcadeBlue - proto: FloorTileItemArcadeBlue
entities: entities:
- uid: 7988 - uid: 7988
@@ -49641,8 +49286,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 3133 - uid: 3133
components: components:
- pos: 40.5,-0.5 - pos: 40.5,-0.5
@@ -49650,8 +49294,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- uid: 9119 - uid: 9119
components: components:
- pos: 14.5,12.5 - pos: 14.5,12.5
@@ -49659,8 +49302,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- proto: Poweredlight - proto: Poweredlight
entities: entities:
- uid: 41 - uid: 41
@@ -52412,62 +52054,6 @@ entities:
pos: -21.5,-15.5 pos: -21.5,-15.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- -0.55,-0.55
- 0.55,-0.55
- 0.55,0.55
- -0.55,0.55
mask: []
layer:
- Impassable
- MidImpassable
- LowImpassable
density: 1
hard: False
restitution: 0
friction: 0.4
id: conveyor
- shape: !type:PolygonShape
radius: 0.01
vertices:
- -0.15,-0.15
- 0.15,-0.15
- 0.15,0.15
- -0.15,0.15
mask: []
layer:
- MidImpassable
- HighImpassable
- LowImpassable
- BulletImpassable
- InteractImpassable
- Opaque
density: 1
hard: False
restitution: 0
friction: 0.4
id: brrt
- shape: !type:PolygonShape
radius: 0.01
vertices:
- -0.49,-0.49
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
mask:
- Impassable
layer:
- BulletImpassable
- Opaque
density: 1
hard: True
restitution: 0
friction: 0.4
id: collision
type: Fixtures
- inputs: - inputs:
Off: Off:
- port: Middle - port: Middle
@@ -65820,27 +65406,6 @@ entities:
- pos: -13.5,7.5 - pos: -13.5,7.5
parent: 31 parent: 31
type: Transform type: Transform
- fixtures:
- shape: !type:PolygonShape
radius: 0.01
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- MidImpassable
- LowImpassable
layer:
- BulletImpassable
- Opaque
density: 145
hard: True
restitution: 0
friction: 0.4
id: null
type: Fixtures
- open: True - open: True
removedMasks: 20 removedMasks: 20
type: EntityStorage type: EntityStorage
@@ -66179,8 +65744,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- containers: - containers:
WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot
showEnts: False showEnts: False
@@ -66207,8 +65771,7 @@ entities:
type: Transform type: Transform
- canCollide: False - canCollide: False
type: Physics type: Physics
- fixtures: []
type: Fixtures
- proto: WeaponDisabler - proto: WeaponDisabler
entities: entities:
- uid: 1130 - uid: 1130

5
Resources/Prototypes/Flavors/flavors.yml
View File

@@ -724,11 +724,6 @@
flavorType: Complex flavorType: Complex
description: flavor-complex-garlic description: flavor-complex-garlic
- type: flavor
id: bottledlightning
flavorType: Complex
description: flavor-complex-bottledlightning
- type: flavor - type: flavor
id: bad-joke id: bad-joke
flavorType: Complex flavorType: Complex