diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml index acc82abebe..67374a81f1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml @@ -47,13 +47,20 @@ - SignalTrigger - type: PayloadTrigger components: - - type: TriggerOnSignal + - type: TimerStartOnSignal - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice - type: WirelessNetworkConnection range: 200 - type: DeviceLinkSink + - type: OnUseTimerTrigger + delay: 3 + initialBeepDelay: 0 + beepSound: + path: /Audio/Machines/Nuke/general_beep.ogg + params: + volume: -2 - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index 2d641568d7..d553b2b2a4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -17,9 +17,9 @@ - type: ActivateOnPaperOpened - type: ExplodeOnTrigger - type: TriggerOnSignal - - type: DeviceLinkSink + - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet, when that functionality is supported. ports: - - Trigger + - Trigger - type: EmitSoundOnUse handle: false # don't want the sound to stop the explosion from triggering diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 391ceb9eba..761e6513d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -64,7 +64,7 @@ - type: TimerStartOnSignal - type: DeviceLinkSink ports: - - Timer + - Timer - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. explosionType: DemolitionCharge totalIntensity: 60 @@ -102,10 +102,10 @@ volume: -6 startOnStick: false canToggleStartOnStick: true - - type: TriggerOnSignal + - type: TimerStartOnSignal - type: DeviceLinkSink ports: - - Trigger + - Timer - type: Explosive explosionType: Cryo totalIntensity: 120