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

[DO NOT MERGE]Добавление кнопок консолей и доступов для ИИ #2336

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
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
85 changes: 75 additions & 10 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,93 @@
type: RadarConsoleBoundUserInterface
enum.CrewMonitoringUIKey.Key:
type: CrewMonitoringBoundUserInterface
enum.GeneralStationRecordConsoleKey.Key:
type: GeneralStationRecordConsoleBoundUserInterface
#SS220 Station Ai Actions start
# enum.GeneralStationRecordConsoleKey.Key:
# type: GeneralStationRecordConsoleBoundUserInterface
#SS220 Station Ai Actions end
enum.SiliconLawsUiKey.Key:
type: SiliconLawBoundUserInterface
enum.CommunicationsConsoleUiKey.Key:
type: CommunicationsConsoleBoundUserInterface
#SS220 Station Ai Actions start
enum.SolarControlConsoleUiKey.Key:
type: SolarControlConsoleBoundUserInterface
enum.CargoConsoleUiKey.Orders:
type: CargoOrderConsoleBoundUserInterface
enum.CriminalRecordsUiKey.Key:
type: CriminalRecordsBoundUserInterface
enum.PowerMonitoringConsoleUiKey.Key:
type: PowerMonitoringConsoleBoundUserInterface
enum.AtmosAlertsComputerUiKey.Key:
type: AtmosAlertsComputerBoundUserInterface
enum.ResearchConsoleUiKey.Key:
type: ResearchConsoleBoundUserInterface
enum.ResearchClientUiKey.Key:
type: ResearchClientBoundUserInterface
enum.SuperMatterObserverUiKey.Key:
type: SuperMatterObserverBUI
enum.RoboticsConsoleUiKey.Key:
type: RoboticsConsoleBoundUserInterface
enum.StationMapUiKey.Key:
type: StationMapBoundUserInterface
#SS220 Station Ai Actions end
- type: IntrinsicUI
uis:
#SS220 Station Ai Actions start
stalengd marked this conversation as resolved.
Show resolved Hide resolved
enum.RadarConsoleUiKey.Key:
toggleAction: ActionAGhostShowRadar
toggleAction: ActionAiShowRadar
enum.CrewMonitoringUIKey.Key:
toggleAction: ActionAGhostShowCrewMonitoring
enum.GeneralStationRecordConsoleKey.Key:
toggleAction: ActionAGhostShowStationRecords
toggleAction: ActionAiShowCrewMonitoring
enum.CommunicationsConsoleUiKey.Key:
toggleAction: ActionAGhostShowCommunications
toggleAction: ActionAiShowCommunications
enum.SolarControlConsoleUiKey.Key:
toggleAction: ActionAiShowSolar
enum.CargoConsoleUiKey.Orders:
toggleAction: ActionAiShowCargo
#SS220 Station Ai Actions end
#SS220 Station Ai Actions start
# enum.GeneralStationRecordConsoleKey.Key:
# toggleAction: ActionAiShowStationRecords
#SS220 Station Ai Actions end
#SS220 Station Ai Actions start
enum.CriminalRecordsUiKey.Key:
toggleAction: ActionAiShowCriminalRecords
enum.PowerMonitoringConsoleUiKey.Key:
toggleAction: ActionAiShowPowerMonitoring
enum.AtmosAlertsComputerUiKey.Key:
toggleAction: ActionAiShowAlertInterface
enum.ResearchConsoleUiKey.Key:
toggleAction: ActionAiShowResearchAndDevelopmentInterface
enum.SuperMatterObserverUiKey.Key:
toggleAction: ActionAiShowSMInterface
enum.RoboticsConsoleUiKey.Key:
toggleAction: ActionAiShowRoboticsConsole
enum.StationMapUiKey.Key:
toggleAction: ActionAiStationMapConsole
#SS220 Station Ai Actions end
- type: CrewMonitoringConsole
- type: GeneralStationRecordConsole
#- type: GeneralStationRecordConsole #SS220 Station Ai Actions
#SS220 Station Ai Actions start
- type: SolarControlConsole
- type: CargoOrderConsole
- type: CriminalRecordsConsole220
- type: PowerMonitoringConsole
- type: AtmosAlertsComputer
- type: ResearchConsole
- type: ResearchClient
- type: TechnologyDatabase
- type: SuperMatterObserver #SS220_TODO: Добавить отоброжение СМа Для ИИ
- type: SuperMatterObserverReceiver
- type: ApcPowerReceiver
needsPower: false
powerLoad: 0
# - type: RoboticsConsole #SS220_TODO:Добавить множественный приём DeviceNetwork
#SS220 Station Ai Actions end
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: CrewMonitor
receiveFrequencyId: CrewMonitor
transmitFrequencyId: ShuttleTimer
- type: StationMap #SS220 Station Ai Actions end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- type: StationMap #SS220 Station Ai Actions end
- type: StationMap #SS220 Station Ai Actions

- type: RadarConsole
followEntity: false
- type: CommunicationsConsole
Expand Down Expand Up @@ -527,4 +592,4 @@
prototypes:
- PlayerBorgSyndicateAssaultGhostRole
- PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
- PlayerBorgSyndicateSaboteurGhostRole
- PlayerBorgSyndicateSaboteurGhostRole
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- PlayerBorgSyndicateSaboteurGhostRole
- PlayerBorgSyndicateSaboteurGhostRole

4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
pack: ChemDispenserStandardInventory
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
- type: StationAiWhitelist #SS220 AI Access
- type: Destructible
thresholds:
- trigger:
Expand Down Expand Up @@ -55,5 +56,6 @@
suffix: Empty
parent: ChemDispenser
components:
- type: StationAiWhitelist #SS220 AI Access
- type: ReagentDispenser
pack: EmptyInventory
pack: EmptyInventory
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pack: EmptyInventory
pack: EmptyInventory

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
pillDosageLimit: 20
- type: Physics
bodyType: Static
- type: StationAiWhitelist #SS220 AI Access
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -92,4 +93,4 @@
- type: GuideHelp
guides:
- Chemicals
- Chemist
- Chemist
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Chemist
- Chemist

3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
layer:
- MachineLayer
- type: Lathe
- type: StationAiWhitelist #SS220 AI Access
- type: MaterialStorage
- type: Destructible
thresholds:
Expand Down Expand Up @@ -1532,4 +1533,4 @@
- Wooden
- RawMaterial
- Plastic
- Ingot
- Ingot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Ingot
- Ingot

Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
- type: Construction
graph: GasBinary
node: pressurepump
- type: StationAiWhitelist #SS220 AI Access
- type: AmbientSound
enabled: false
volume: -9
Expand Down Expand Up @@ -104,6 +105,7 @@
Off: { state: pumpVolume }
Blocked: { state: pumpVolumeBlocked }
- type: PipeColorVisuals
- type: StationAiWhitelist #SS220 AI Access
- type: GasVolumePump
enabled: false
- type: UserInterface
Expand Down Expand Up @@ -449,4 +451,4 @@
pipeDirection: South
- type: Construction
graph: GasBinary
node: radiator
node: radiator
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
node: radiator
node: radiator

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
collection: GlassSmash
- type: WallMount
arc: 360
- type: StationAiWhitelist #SS220 AI Access
- type: Sprite
drawdepth: AboveFovOverlay #SS220 Perpective-wall-fov
sprite: Structures/Wallmounts/barsign.rsi
Expand Down Expand Up @@ -265,4 +266,4 @@
description: You can't get away from them, even in space, and even after we started calling them 'spesos' instead.
components:
- type: BarSign
current: Spacebucks
current: Spacebucks
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
current: Spacebucks
current: Spacebucks

142 changes: 142 additions & 0 deletions Resources/Prototypes/SS220/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
- type: entity
id: ActionAiShowCrewMonitoring
name: Crew Monitoring Interface
description: View a Crew Monitoring Interface.
components:
- type: InstantAction
icon: Interface/Actions/actions_ai.rsi/crew_monitor.png #Off sprite
iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png #Off sprite
keywords: [ "AI", "console", "interface" ]
priority: -21
event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }

- type: entity
id: ActionAiShowCommunications
name: Communications Interface
description: View a Communications Interface.
components:
- type: InstantAction
icon: Interface/Actions/actions_ai.rsi/comms_console.png #Off sprite
iconOn: Interface/Actions/actions_ai.rsi/comms_console.png # Off-sprite
keywords: [ "AI", "console", "interface" ]
priority: -20
event: !type:ToggleIntrinsicUIEvent { key: enum.CommunicationsConsoleUiKey.Key }
- type: entity
id: ActionAiShowCriminalRecords
name: Criminal Records Interface
description: View a Station Criminal Record
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/criminal_records.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/criminal_records.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -19
event: !type:ToggleIntrinsicUIEvent { key: enum.CriminalRecordsUiKey.Key }

- type: entity
id: ActionAiShowRoboticsConsole
name: Robotics Console Interface
description: View a Borg info
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/robotics_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/robotics_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -18
event: !type:ToggleIntrinsicUIEvent { key: enum.RoboticsConsoleUiKey.Key }

- type: entity
id: ActionAiStationMapConsole
name: Statione Map Interface
description: View a Station Map
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/station_map.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/station_map.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -17
event: !type:ToggleIntrinsicUIEvent { key: enum.StationMapUiKey.Key }

- type: entity
id: ActionAiShowPowerMonitoring
name: Power Monitoring Interface
description: View a Power of Station
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/power_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/power_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -16
event: !type:ToggleIntrinsicUIEvent { key: enum.PowerMonitoringConsoleUiKey.Key }

- type: entity
id: ActionAiShowAlertInterface
name: Alert Interface
description: View a Alerts on Station
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/alert_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/alert_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -15
event: !type:ToggleIntrinsicUIEvent { key: enum.AtmosAlertsComputerUiKey.Key }

- type: entity
id: ActionAiShowRadar
name: Mass Scanner Interface
description: View a Mass Scanner Interface.
components:
- type: InstantAction
icon: Interface/Actions/actions_ai.rsi/mass_scanner.png # Off-sprite
iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png # Off-sprite
keywords: [ "AI", "console", "interface" ]
priority: -14
event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }

- type: entity
id: ActionAiShowCargo
name: Cargo Ordering Interface
description: View a Cargo Ordering Interface.
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/cargo_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/cargo_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -13
event: !type:ToggleIntrinsicUIEvent { key: enum.CargoConsoleUiKey.Orders }

- type: entity
id: ActionAiShowResearchAndDevelopmentInterface
name: RaD Interface
description: View a RaD interface
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/rad_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/rad_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -12
event: !type:ToggleIntrinsicUIEvent { key: enum.ResearchConsoleUiKey.Key }

- type: entity
id: ActionAiShowSolar
name: Solar Control Interface
description: View a Solar Control Interface.
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/solar_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/solar_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -11
event: !type:ToggleIntrinsicUIEvent { key: enum.SolarControlConsoleUiKey.Key }

- type: entity
id: ActionAiShowSMInterface
name: Super Matter Observer Interface
description: View a SM interface
components:
- type: InstantAction
icon: SS220/Interface/Actions/actions_ai.rsi/sm_console.png # SS220-Resprite
iconOn: SS220/Interface/Actions/actions_ai.rsi/sm_console.png # SS220-Resprite
keywords: [ "AI", "console", "interface" ]
priority: -10
event: !type:ToggleIntrinsicUIEvent { key: enum.SuperMatterObserverUiKey.Key }
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
shape:
!type:PhysShapeCircle
radius: 0.2
- type: StationAiWhitelist #SS220 AI Access
- type: Photocopier
formCollections: [ "nanotrasen_station" ]
contrabandFormCollections: [ "syndicate" ]
Expand Down Expand Up @@ -84,6 +85,7 @@
parent: PhotocopierBase
name: central command photocopier
components:
- type: StationAiWhitelist #SS220 AI Access
- type: Photocopier
formCollections: [ "nanotrasen_station", "nanotrasen_central_command" ]
tonerSlot:
Expand Down Expand Up @@ -132,4 +134,4 @@
capacity: 10000
charges: 10000
- type: StaticPrice
price: 2500
price: 2500
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
price: 2500
price: 2500

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- type: Computer
board: SuperMatterObserverCircuitboard
- type: SuperMatterObserver
- type: StationAiWhitelist #SS220 AI Access
- type: SuperMatterObserverReceiver
- type: ActivatableUIRequiresPower
- type: ActivatableUI
Expand Down Expand Up @@ -52,4 +53,4 @@
completetime: 4
materials:
Steel: 100
Glass: 500
Glass: 500
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Glass: 500
Glass: 500

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading