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

Jump to bottom

Butlergone (Cherry-Pick From Delta-V) #678

Merged
merged 2 commits into from
Aug 7, 2024
Merged

Butlergone (Cherry-Pick From Delta-V) #678

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
2719c9f
Mr. Butlertron can now be vinced (#1100)
Apr 16, 2024
d8881a7
Roboisseur no longer sends messages in the chat (#1222)
NullWanderer May 18, 2024
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
4 changes: 2 additions & 2 deletions Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public override void Update(float frameTime)
}
else if (CheckTier(roboisseur.DesiredPrototype.ID, roboisseur) > 2)
message = Loc.GetString(_random.Pick(roboisseur.DemandMessagesTier2), ("item", roboisseur.DesiredPrototype.Name));
_chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, false);
_chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, true);
}

if (roboisseur.Accumulator >= roboisseur.ResetTime.TotalSeconds)
Expand Down Expand Up @@ -100,7 +100,7 @@ private void OnInteractHand(EntityUid uid, RoboisseurComponent component, Intera
if (CheckTier(component.DesiredPrototype.ID, component) > 1)
message = Loc.GetString(_random.Pick(component.DemandMessagesTier2), ("item", component.DesiredPrototype.Name));

_chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, false);
_chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, true);
}

private void OnInteractUsing(EntityUid uid, RoboisseurComponent component, InteractUsingEvent args)
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/NPC/roboisseur.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@
name: Mr. Butlertron
description: It asks for food to deliver to exotic customers across the cosmos. Powered by the latest technology in bluespace food delivery.
components:
- type: Anchorable
- type: Pullable
- type: Sprite
noRot: true
drawdepth: Mobs
sprite: DeltaV/Structures/Machines/roboisseur.rsi
layers:
- state: roboisseur-1
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1000
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Roboisseur
- type: Speech
speechSounds: Pai
Expand Down
Loading