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

Last lost last lost last lost last... lost soul fix #2470

Merged
merged 7 commits into from
Jan 17, 2025
Merged

Last lost last lost last lost last... lost soul fix #2470

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
2ab3201
InitCommit
UrPrice Jan 9, 2025
ff9bbcb
Меня убила mark'а
UrPrice Jan 9, 2025
2559354
Я убила mark'а
UrPrice Jan 16, 2025
08f34af
Merge branch 'lostsoulsfix' of https://github.com/UrPrice/space-stati…
UrPrice Jan 16, 2025
2789b19
Merge branch 'SerbiaStrong-220:master' into lostsoulsfix
UrPrice Jan 16, 2025
08af0a7
Нас убила mark'а
UrPrice Jan 16, 2025
29c7d20
Они убили mark'а
UrPrice Jan 17, 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
165 changes: 98 additions & 67 deletions Resources/Maps/SS220/Shuttles/lostSoul/traveling_china_cuisine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ entities:
version: 6
0,-1:
ind: 0,-1
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqAAAAAAAqAAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqQAAAAAAgwAAAAAAqQAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqAAAAAAAqAAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAARwAAAAAAqQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqQAAAAAAqQAAAAAAgwAAAAAAqQAAAAAAqQAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
version: 6
-1,-1:
ind: -1,-1
Expand Down Expand Up @@ -244,39 +244,41 @@ entities:
data:
tiles:
0,0:
0: 31999
0: 31983
1: 16
0,1:
0: 273
1: 8256
2: 8256
-1,0:
0: 51063
-1,1:
1: 32849
2: 32849
0,-1:
0: 20479
1,0:
0: 17
1: 8738
0: 1
1: 16
2: 8738
1,1:
1: 17
2: 17
1,-1:
1: 8738
2: 8738
0: 273
-2,0:
1: 34952
2: 34952
-2,-1:
1: 34824
2: 34824
0: 128
-1,-1:
0: 20222
0,-2:
1: 1536
2: 1536
-1,-2:
1: 3328
2: 3328
1,-2:
1: 8448
2: 8448
-2,-2:
1: 32768
2: 32768
uniqueMixes:
- volume: 2500
temperature: 293.15
Expand All @@ -293,6 +295,21 @@ entities:
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 21.6852
- 81.57766
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- volume: 2500
immutable: True
moles:
Expand Down Expand Up @@ -352,12 +369,11 @@ entities:
rot: -1.5707963267948966 rad
pos: -4.5,-2.5
parent: 1
- proto: AirlockMaintLocked
- proto: AirlockMaint
entities:
- uid: 8
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -1.5,-0.5
parent: 1
- proto: APCBasic
Expand All @@ -368,6 +384,8 @@ entities:
rot: -1.5707963267948966 rad
pos: -0.5,1.5
parent: 1
- type: AccessReader
access: []
- proto: AtmosDeviceFanTiny
entities:
- uid: 10
Expand Down Expand Up @@ -851,8 +869,8 @@ entities:
immutable: False
temperature: 293.14673
moles:
- 1.7459903
- 6.568249
- 1.8856695
- 7.0937095
- 0
- 0
- 0
Expand All @@ -869,24 +887,24 @@ entities:
showEnts: False
occludes: True
ents:
- 23
- 35
- 30
- 24
- 32
- 31
- 29
- 28
- 20
- 34
- 33
- 19
- 27
- 22
- 18
- 26
- 25
- 21
- 25
- 26
- 18
- 22
- 27
- 19
- 33
- 34
- 20
- 28
- 29
- 31
- 32
- 24
- 30
- 35
- 23
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
Expand Down Expand Up @@ -1360,6 +1378,8 @@ entities:
- type: Transform
pos: -3.5,1.5
parent: 1
- type: PowerSupplier
supplyRate: 25000
- proto: GravityGeneratorMini
entities:
- uid: 166
Expand Down Expand Up @@ -1387,6 +1407,16 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,6.5
parent: 1
- uid: 248
components:
- type: Transform
pos: 5.5,-2.5
parent: 1
- uid: 249
components:
- type: Transform
pos: 5.5,-1.5
parent: 1
- proto: GrilleDiagonal
entities:
- uid: 170
Expand Down Expand Up @@ -1457,6 +1487,8 @@ entities:
- type: Transform
pos: 4.5,1.5
parent: 1
- type: AccessReader
access: []
- type: Lock
locked: False
- type: EntityStorage
Expand All @@ -1465,8 +1497,8 @@ entities:
immutable: False
temperature: 293.14673
moles:
- 1.7459903
- 6.568249
- 1.8856695
- 7.0937095
- 0
- 0
- 0
Expand All @@ -1483,20 +1515,20 @@ entities:
showEnts: False
occludes: True
ents:
- 109
- 110
- 108
- 113
- 104
- 111
- 103
- 105
- 112
- 106
- 107
- 114
- 115
- 116
- 115
- 114
- 107
- 106
- 112
- 105
- 103
- 111
- 104
- 113
- 108
- 110
- 109
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
Expand Down Expand Up @@ -1751,6 +1783,16 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,6.5
parent: 1
- uid: 297
components:
- type: Transform
pos: 5.5,-1.5
parent: 1
- uid: 298
components:
- type: Transform
pos: 5.5,-2.5
parent: 1
- proto: ShuttleWindowDiagonal
entities:
- uid: 196
Expand Down Expand Up @@ -1973,6 +2015,8 @@ entities:
- type: Transform
pos: 3.5,2.5
parent: 1
- type: AccessReader
access: []
- proto: VendingMachineCoffee
entities:
- uid: 224
Expand Down Expand Up @@ -2121,23 +2165,10 @@ entities:
- type: Transform
pos: -4.5,-0.5
parent: 1
- uid: 248
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 5.5,-3.5
parent: 1
- uid: 249
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 5.5,-2.5
parent: 1
- uid: 250
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 5.5,-1.5
pos: 5.5,-3.5
parent: 1
- uid: 251
components:
Expand Down Expand Up @@ -2404,13 +2435,13 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: WindoorSecureKitchenLocked
- proto: WindoorSecure
entities:
- uid: 294
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,-3.5
pos: 0.5,-1.5
parent: 1
- uid: 295
components:
Expand All @@ -2422,6 +2453,6 @@ entities:
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,-1.5
pos: 0.5,-3.5
parent: 1
...
1 change: 1 addition & 0 deletions Resources/Prototypes/GameRules/unknown_shuttles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- id: UnknownShuttleTravelingCuisine
- id: UnknownShuttleDisasterEvacPod
- id: UnknownShuttleHonki
- id: UnknownShuttleCivil
#SS220-NoUnknownShuttles begin
# - id: UnknownShuttleNTQuark
# - id: UnknownShuttleCruiser
Expand Down
Loading
Loading