Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Vonsant committed Aug 11, 2024
2 parents 6a4afcb + 90463ea commit 3bab412
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6187,3 +6187,9 @@ Entries:
message: Arachnid genetic code match other sector closer now.
id: 5186
time: '2024-08-10T19:57:11.0000000+00:00'
- author: Leander
changes:
- type: Add
message: Observer ghost can now use their own mass scanner to watch ships around.
id: 5187
time: '2024-08-11T15:56:44.0000000+00:00'
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
title: comms-console-announcement-title-centcom
color: "#228b22"
- type: RadarConsole
maxRange: 1024 # Frontier: increase admin radar range
followEntity: true
- type: CargoOrderConsole
- type: CrewMonitoringConsole
Expand Down
22 changes: 22 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/observer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,19 @@
- type: Tag
tags:
- BypassInteractionRangeChecks
# Frontier: changes to the prototype so it can access radars
- type: UserInterface
interfaces:
enum.RadarConsoleUiKey.Key:
type: RadarConsoleBoundUserInterface
- type: IntrinsicUI
uis:
enum.RadarConsoleUiKey.Key:
toggleAction: ActionObserverShowRadar
- type: RadarConsole
followEntity: true
- type: ComplexInteraction # Needed to interact with innate radar console
# End Frontier

- type: entity
id: ActionGhostBoo
Expand All @@ -71,6 +84,15 @@
checkCanInteract: false
event: !type:ToggleLightingActionEvent

# Frontier: radar action
- type: entity
id: ActionObserverShowRadar
parent: ActionAGhostShowRadar
components:
- type: InstantAction
checkCanInteract: false
# End Frontier

- type: entity
id: ActionToggleFov
name: Toggle FoV
Expand Down

0 comments on commit 3bab412

Please sign in to comment.