From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 21 Apr 2025 22:49:43 +0000 (+0200) Subject: Fix bots parenting, emotes (#29949) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=00cd08231a224b2290441e71656783966cef5bfa;p=space-station-14.git Fix bots parenting, emotes (#29949) * Bots overhaul * fix * change speech sound to pai * purge a lot * i forgor :trollface: * adjust * that aswell --- diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 7d63ee873b..24f66948a7 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -237,6 +237,7 @@ - DoorBumpOpener - FootstepSound - CanPilot + - SiliconEmotes - Unimplantable - type: Emoting - type: GuideHelp diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 2a959a1099..ceb9e67330 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -1,33 +1,17 @@ - type: entity save: false abstract: true + parent: BaseMob id: MobSiliconBase components: - - type: LagCompensation - type: Reactive groups: Acidic: [Touch] - - type: Clickable - type: Damageable damageContainer: Inorganic - - type: InteractionOutline - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - MobMask - layer: - - MobLayer - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4 - - type: Sprite - noRot: true - drawdepth: Mobs - type: NpcFactionMember factions: - SimpleNeutral @@ -57,7 +41,7 @@ - Stutter - Electrocution - type: NameIdentifier - group: GenericNumber + group: Silicon - type: Repairable doAfterDelay: 8 fuelCost: 15 @@ -65,6 +49,7 @@ - type: Tag tags: - DoorBumpOpener + - SiliconEmotes - Bot - Unimplantable - type: MobState @@ -93,10 +78,6 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Input - context: "human" - - type: InputMover - - type: MobMover - type: Body prototype: Bot - type: GuideHelp @@ -107,6 +88,10 @@ speechSounds: Pai #couldn't decide if this should be borg or pai sounds so I flipped a coin. - type: TypingIndicator proto: robot + - type: Vocal + sounds: + Unsexed: UnisexSilicon + - type: Emoting - type: ZombieImmune - type: ProtectedFromStepTriggers - type: NoSlip @@ -367,10 +352,8 @@ description: Why not give the mimebot a friendly wave? components: - type: Sprite - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: mimebot - sprite: Mobs/Silicon/Bots/mimebot.rsi + sprite: Mobs/Silicon/Bots/mimebot.rsi + state: mimebot - type: MimePowers - type: Construction graph: MimeBot @@ -400,7 +383,7 @@ - type: Sprite sprite: Mobs/Silicon/Bots/supplybot.rsi layers: - - map: ["enum.DamageStateVisualLayers.Base", "movement"] + - map: ["movement"] state: supplybot - type: SpriteMovement movementLayers: @@ -452,6 +435,7 @@ tags: - DoorBumpOpener - FootstepSound + - SiliconEmotes - Bot - Unimplantable - type: ActiveRadio diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index eab4b0bc33..47a203e1fd 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -13,8 +13,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-cough"] chatTriggers: - cough @@ -60,8 +60,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-yawn"] chatTriggers: - yawn diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index dca222b420..53cf905845 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -8,8 +8,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-scream"] chatTriggers: - scream @@ -38,8 +38,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-laugh"] chatTriggers: - laugh @@ -67,7 +67,8 @@ requireAll: true components: - Vocal - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-honk"] chatTriggers: - honk @@ -84,8 +85,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-sigh"] chatTriggers: - sigh @@ -101,8 +102,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-whistle"] chatTriggers: - whistle @@ -118,8 +119,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-crying"] chatTriggers: - cry @@ -139,8 +140,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-squish"] chatTriggers: - squish @@ -157,8 +158,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-chitter"] chatTriggers: - chitter @@ -175,8 +176,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-squeak"] chatTriggers: - squeak @@ -193,8 +194,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-click"] chatTriggers: - click @@ -210,8 +211,8 @@ components: - Hands blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-clap"] chatTriggers: - claps @@ -227,8 +228,8 @@ components: - Hands blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: [ "chat-emote-msg-clap-single" ] chatTriggers: - clap @@ -246,8 +247,8 @@ components: - Hands blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-snap"] chatTriggers: - snap @@ -273,8 +274,8 @@ components: - Hands blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-thump"] chatTriggers: - thump @@ -297,8 +298,8 @@ components: - Hands blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-salute"] chatTriggers: - salute @@ -341,8 +342,9 @@ whitelist: requireAll: true components: - - BorgChassis - Vocal + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -375,8 +377,8 @@ - Nymph - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-chirp"] chatTriggers: - chirp @@ -393,8 +395,9 @@ whitelist: requireAll: true components: - - BorgChassis - Vocal + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -410,8 +413,9 @@ whitelist: requireAll: true components: - - BorgChassis - Vocal + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -427,8 +431,9 @@ whitelist: requireAll: true components: - - BorgChassis - Vocal + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -450,8 +455,9 @@ whitelist: requireAll: true components: - - BorgChassis - Vocal + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 910c24b303..09c205686c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1144,6 +1144,9 @@ - type: Tag id: SilentStorageUser # used in SharedStorageSystem, so the entity will do all silently +- type: Tag + id: SiliconEmotes + - type: Tag id: SkeletonMotorcycleKeys