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.

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

lighthouse update #2584

Merged
merged 2 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
126 changes: 54 additions & 72 deletions Resources/Maps/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9840,7 +9840,7 @@ entities:
pos: -12.5,-46.5
parent: 100
- type: Door
secondsUntilStateChange: -751.62256
secondsUntilStateChange: -971.60486
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -13466,6 +13466,11 @@ entities:
- type: Transform
pos: 5.5,-47.5
parent: 100
- uid: 13440
components:
- type: Transform
pos: -4.5,-53.5
parent: 100
- uid: 13630
components:
- type: Transform
Expand Down Expand Up @@ -13534,12 +13539,7 @@ entities:
- uid: 14585
components:
- type: Transform
pos: 0.5,-35.5
parent: 100
- uid: 14703
components:
- type: Transform
pos: -6.5,-35.5
pos: -3.5,-52.5
parent: 100
- uid: 14704
components:
Expand Down Expand Up @@ -45516,22 +45516,6 @@ entities:
- 4648
- 4646
- 4649
- type: GroupExamine
group:
- hoverMessage: ""
contextText: verb-examine-group-other
icon: /Textures/Interface/examine-star.png
components:
- Armor
- ClothingSpeedModifier
entries:
- message: >-
It provides the following protection:

- [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
priority: 0
component: Armor
title: null
- uid: 19023
components:
- type: Transform
Expand Down Expand Up @@ -61882,7 +61866,7 @@ entities:
pos: -11.5,-57.5
parent: 100
- type: Label
currentLabel: plasma storage
currentLabel: Plasma Storage
- type: NameModifier
baseName: gas pipe sensor
- uid: 5212
Expand All @@ -61894,7 +61878,7 @@ entities:
pos: -11.5,-55.5
parent: 100
- type: Label
currentLabel: oxygen miner
currentLabel: Oxygen Miner
- type: NameModifier
baseName: gas pipe sensor
- uid: 5259
Expand All @@ -61906,7 +61890,7 @@ entities:
pos: -11.5,-53.5
parent: 100
- type: Label
currentLabel: nitrogen miner
currentLabel: Nitrogen Miner
- type: NameModifier
baseName: gas pipe sensor
- uid: 13958
Expand All @@ -61918,7 +61902,7 @@ entities:
pos: -11.5,-59.5
parent: 100
- type: Label
currentLabel: waste storage
currentLabel: Waste Storage
- type: NameModifier
baseName: gas pipe sensor
- proto: GasPipeSensorDistribution
Expand Down Expand Up @@ -93343,9 +93327,9 @@ entities:
- type: Transform
pos: -62.5,79.5
parent: 100
- proto: HolopadCargoBayLongRange
- proto: HolopadCargoBay
entities:
- uid: 21701
- uid: 9332
components:
- type: Transform
pos: -52.5,-4.5
Expand Down Expand Up @@ -93378,19 +93362,19 @@ entities:
- type: Transform
pos: -42.5,-16.5
parent: 100
- proto: HolopadCommandBridgeHallway
- proto: HolopadCommandBridge
entities:
- uid: 21700
- uid: 12645
components:
- type: Transform
pos: -15.5,60.5
pos: -10.5,76.5
parent: 100
- proto: HolopadCommandBridgeLongRange
- proto: HolopadCommandBridgeHallway
entities:
- uid: 21699
- uid: 21700
components:
- type: Transform
pos: -10.5,76.5
pos: -15.5,60.5
parent: 100
- proto: HolopadCommandCaptain
entities:
Expand Down Expand Up @@ -95687,23 +95671,6 @@ entities:
- type: Transform
pos: 14.5,-23.5
parent: 100
- proto: MeteorRock
entities:
- uid: 9332
components:
- type: Transform
pos: -3.5,-52.5
parent: 100
- uid: 12645
components:
- type: Transform
pos: -6.5,-32.5
parent: 100
- uid: 13440
components:
- type: Transform
pos: -4.5,-53.5
parent: 100
- proto: MicroManipulatorStockPart
entities:
- uid: 19446
Expand Down Expand Up @@ -103586,11 +103553,6 @@ entities:
- type: Transform
pos: -4.5,-45.5
parent: 100
- uid: 5380
components:
- type: Transform
pos: 8.5,-43.5
parent: 100
- uid: 5389
components:
- type: Transform
Expand Down Expand Up @@ -103841,11 +103803,6 @@ entities:
- type: Transform
pos: -25.5,-60.5
parent: 100
- uid: 9082
components:
- type: Transform
pos: 11.5,-39.5
parent: 100
- uid: 9089
components:
- type: Transform
Expand Down Expand Up @@ -104426,11 +104383,6 @@ entities:
- type: Transform
pos: -0.5,-30.5
parent: 100
- uid: 13652
components:
- type: Transform
pos: -0.5,-32.5
parent: 100
- uid: 13655
components:
- type: Transform
Expand Down Expand Up @@ -104991,11 +104943,6 @@ entities:
- type: Transform
pos: 14.5,-46.5
parent: 100
- uid: 14639
components:
- type: Transform
pos: 14.5,-45.5
parent: 100
- uid: 14640
components:
- type: Transform
Expand Down Expand Up @@ -133525,6 +133472,11 @@ entities:
- type: Transform
pos: -52.5,43.5
parent: 100
- uid: 5380
components:
- type: Transform
pos: -0.5,-32.5
parent: 100
- uid: 5562
components:
- type: Transform
Expand Down Expand Up @@ -133833,6 +133785,11 @@ entities:
- type: Transform
pos: -4.5,-26.5
parent: 100
- uid: 9082
components:
- type: Transform
pos: -6.5,-35.5
parent: 100
- uid: 9085
components:
- type: Transform
Expand Down Expand Up @@ -134240,6 +134197,11 @@ entities:
rot: 3.141592653589793 rad
pos: -38.5,-5.5
parent: 100
- uid: 13652
components:
- type: Transform
pos: -6.5,-32.5
parent: 100
- uid: 13689
components:
- type: Transform
Expand Down Expand Up @@ -134496,6 +134458,11 @@ entities:
- type: Transform
pos: -43.5,53.5
parent: 100
- uid: 14639
components:
- type: Transform
pos: 14.5,-45.5
parent: 100
- uid: 14652
components:
- type: Transform
Expand Down Expand Up @@ -134523,6 +134490,11 @@ entities:
rot: 3.141592653589793 rad
pos: -37.5,-5.5
parent: 100
- uid: 14703
components:
- type: Transform
pos: 11.5,-39.5
parent: 100
- uid: 15057
components:
- type: Transform
Expand Down Expand Up @@ -134777,6 +134749,16 @@ entities:
rot: 1.5707963267948966 rad
pos: -2.5,55.5
parent: 100
- uid: 21699
components:
- type: Transform
pos: 0.5,-35.5
parent: 100
- uid: 21701
components:
- type: Transform
pos: 8.5,-43.5
parent: 100
- proto: WallSolidDiagonal
entities:
- uid: 10160
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Maps/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
availableJobs:
#command
Captain: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ]
StationAi: [ 1, 1 ]
#service
HeadOfPersonnel: [ 1, 1 ]
Expand Down Expand Up @@ -72,7 +73,8 @@
Quartermaster: [ 1, 1 ]
Courier: [ 2, 2 ]
SalvageSpecialist: [ 4, 4 ]
CargoTechnician: [ 2, 4 ]
CargoTechnician: [ 2, 3 ]
CargoAssistant: [ 2, 2 ]
#civilian
Passenger: [ -1, -1 ]

Loading