Skip to content

Commit

Permalink
Merge pull request #12 from spess-empyrean/ai_holo_revert
Browse files Browse the repository at this point in the history
Reverts EE AI Hologram Change
  • Loading branch information
spess-empyrean authored Jan 13, 2025
2 parents ec0b4ad + 3b1583e commit 98fe0f6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 19 deletions.
2 changes: 2 additions & 0 deletions Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
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
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
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
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

0 comments on commit 98fe0f6

Please sign in to comment.