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

Resprite #33

Merged
merged 21 commits into from
Jun 7, 2024
Merged

Resprite #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5363f21
wall and railing
Odleer Jun 4, 2024
8133f11
Rust wall
Odleer Jun 4, 2024
31506ff
Window
Odleer Jun 4, 2024
b96eb6c
Window 2
Odleer Jun 4, 2024
94fdda2
Window 3
Odleer Jun 4, 2024
2edc0b4
Wallmounts
Odleer Jun 4, 2024
73afbeb
Airlock
Odleer Jun 4, 2024
236d159
add delta
Odleer Jun 4, 2024
4fdfea6
Airlock
Odleer Jun 5, 2024
841366c
emergency
Odleer Jun 5, 2024
0fc77d8
Merge branch 'space-sunrise:master' into Delta
Odleer Jun 5, 2024
6a48ca1
Merge branch 'space-sunrise:master' into Resprite
Odleer Jun 5, 2024
c8ae120
Merge branch 'Resprite' of https://github.com/Odleer/space-sunrise-14…
Odleer Jun 5, 2024
84e6800
Airlock
Odleer Jun 5, 2024
5b7516d
Airlock
Odleer Jun 5, 2024
be8692d
Final Sprite
Odleer Jun 5, 2024
d3be0ad
Maps
Odleer Jun 6, 2024
4816abc
Maps
Odleer Jun 6, 2024
208ef50
Merge branch 'space-sunrise:master' into Resprite
Odleer Jun 6, 2024
0659367
Changelog
Odleer Jun 6, 2024
70e0c07
Merge branch 'master' into Resprite
VigersRay Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 16 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,19 @@ Entries:
type: Fix
id: 22
time: '2024-06-07T08:01:08.686524+00:00'
- author: Odleer
changes:
- message: "\u0420\u0435\u0434\u0438\u0437\u0430\u0439\u0434 \u0441\u043F\u0440\u0430\
\u0439\u0442\u043E\u0432 \u0448\u043B\u044E\u0437\u043E\u0432, \u043F\u043B\
\u0438\u0442\u043A\u0438, \u0441\u0442\u0435\u043D \u0438 \u043C\u043D\u043E\
\u0433\u043E\u0433\u043E \u0434\u0440\u0443\u0433\u043E\u0433\u043E."
type: Tweak
- message: "\u0412 \u043F\u0443\u043B\u043B\u0435 \u043A\u0430\u0440\u0442 marathon,
fland, delta, cluster, box."
type: Tweak
- message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0438\
\u0437\u043C\u0435\u043D\u0451\u043D\u043D\u043E\u0439 \u0441\u0442\u0430\u043D\
\u0446\u0438\u0438 delta."
type: Add
id: 23
time: '2024-06-06T18:03:25.670495+00:00'
76 changes: 19 additions & 57 deletions Resources/Maps/Shuttles/trading_outpost.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ entities:
- 402
- 790
- 789
- type: AtmosDevice
joinedGrid: 2
- uid: 803
components:
- type: Transform
Expand All @@ -416,8 +414,6 @@ entities:
- 411
- 789
- 790
- type: AtmosDevice
joinedGrid: 2
- uid: 805
components:
- type: Transform
Expand All @@ -433,8 +429,6 @@ entities:
- 408
- 783
- 782
- type: AtmosDevice
joinedGrid: 2
- uid: 806
components:
- type: Transform
Expand All @@ -450,8 +444,6 @@ entities:
- 409
- 783
- 782
- type: AtmosDevice
joinedGrid: 2
- proto: AirCanister
entities:
- uid: 387
Expand All @@ -462,56 +454,58 @@ entities:
parent: 2
- type: Physics
bodyType: Static
- type: AtmosDevice
joinedGrid: 2
- proto: AirlockCargo
entities:
- uid: 1
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 11.5,1.5
parent: 2
- uid: 22
- uid: 20
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,1.5
parent: 2
- proto: AirlockCargoGlass
entities:
- uid: 248
- uid: 22
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 11.5,5.5
parent: 2
- uid: 249
- uid: 248
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,5.5
parent: 2
- proto: AirlockExternalGlass
entities:
- uid: 582
- uid: 249
components:
- type: Transform
rot: 3.141592653589793 rad
rot: -1.5707963267948966 rad
pos: -0.5,-5.5
parent: 2
- uid: 583
- uid: 582
components:
- type: Transform
rot: 3.141592653589793 rad
rot: -1.5707963267948966 rad
pos: -0.5,-3.5
parent: 2
- uid: 584
- uid: 583
components:
- type: Transform
rot: 3.141592653589793 rad
rot: -1.5707963267948966 rad
pos: 11.5,-5.5
parent: 2
- uid: 585
- uid: 584
components:
- type: Transform
rot: 3.141592653589793 rad
rot: -1.5707963267948966 rad
pos: 11.5,-3.5
parent: 2
- proto: AirlockExternalGlassShuttleLocked
Expand Down Expand Up @@ -2941,8 +2935,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 5.5,-15.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: GasPassiveVent
entities:
- uid: 397
Expand All @@ -2951,16 +2943,12 @@ entities:
rot: 1.5707963267948966 rad
pos: 6.5,-15.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 414
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 5.5,-13.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: GasPipeBend
entities:
- uid: 316
Expand Down Expand Up @@ -3534,9 +3522,13 @@ entities:
- uid: 511
components:
- type: Transform
anchored: False
rot: -1.5707963267948966 rad
pos: 0.5,5.5
parent: 2
- type: Physics
canCollide: True
bodyType: Dynamic
- uid: 513
components:
- type: Transform
Expand Down Expand Up @@ -3648,8 +3640,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 4.5,-15.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: GasVentPump
entities:
- uid: 398
Expand All @@ -3658,46 +3648,34 @@ entities:
rot: 3.141592653589793 rad
pos: 8.5,-17.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 400
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,-8.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 401
components:
- type: Transform
pos: 2.5,6.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 402
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 10.5,-0.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 403
components:
- type: Transform
pos: 8.5,6.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 412
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 1.5,-16.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: GasVentScrubber
entities:
- uid: 399
Expand All @@ -3706,46 +3684,34 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.5,-15.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 408
components:
- type: Transform
pos: 1.5,6.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 409
components:
- type: Transform
pos: 9.5,6.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 410
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 10.5,-8.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 411
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,-0.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- uid: 413
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 7.5,-17.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: GeneratorRTG
entities:
- uid: 367
Expand Down Expand Up @@ -4329,17 +4295,13 @@ entities:
- type: Transform
pos: 5.5,-17.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: LiquidOxygenCanister
entities:
- uid: 384
components:
- type: Transform
pos: 4.5,-17.5
parent: 2
- type: AtmosDevice
joinedGrid: 2
- proto: Paper
entities:
- uid: 775
Expand Down
Loading
Loading