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

Reverts EE AI Hologram Change #12

Merged
merged 2 commits into from
Jan 13, 2025
Merged

Reverts EE AI Hologram Change #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
764f80f
Reverts AI eye hologram
spess-empyrean Jan 13, 2025
3b1583e
Reverts lack of FOV changes for station AI
spess-empyrean Jan 13, 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
2 changes: 2 additions & 0 deletions Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ private void AttachEye(Entity<StationAiCoreComponent> ent)

if (TryComp(user, out EyeComponent? eyeComp))
{
_eye.SetDrawFov(user, false, eyeComp);
_eye.SetTarget(user, ent.Comp.RemoteEntity.Value, eyeComp);
}

Expand Down Expand Up @@ -349,6 +350,7 @@ private void OnAiRemove(Entity<StationAiCoreComponent> ent, ref EntRemovedFromCo

if (TryComp(args.Entity, out EyeComponent? eyeComp))
{
_eye.SetDrawFov(args.Entity, true, eyeComp);
_eye.SetTarget(args.Entity, null, eyeComp);
}
}
Expand Down
24 changes: 5 additions & 19 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,37 +319,23 @@
- Incorporeal
- BaseMob
id: StationAiHolo
name: Hologram
description: A projection of the AI.
name: AI eye
description: The AI's viewer.
categories: [ HideSpawnMenu ]
suffix: DO NOT MAP
components:
- type: WarpPoint
follow: true
- type: Eye
pvsScale: 1.5
- type: Visibility
layer: 2
- type: Sprite
sprite: Mobs/Silicon/station_ai.rsi
layers:
- state: default
- state: ai_camera
shader: unshaded
map: ["base"]
- type: LanguageKnowledge
speaks:
- TauCetiBasic
- SolCommon
- Tradeband
- Freespeak
- Elyran
- RobotTalk
understands:
- TauCetiBasic
- SolCommon
- Tradeband
- Freespeak
- Elyran
- RobotTalk
- Sign # It's intentional that they don't "Speak" sign language.

# Borgs
- type: entity
Expand Down
Binary file added Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_camera.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
0.1
]
]
},
{
"name": "ai_camera",
"delays": [
[
1.0,
1.0
]
]
},
{
"name": "ai_dead"
Expand Down
Loading