Move grenade components to shared (#22691)
* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Delete .run/Content Server+Client.run.xml HOW DID THIS GET IN HERE ITS NOT AHHHH * Update Content.Client/Explosion/SmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update ExplodeOnTriggerComponent.cs * Revert "Delete .run/Content Server+Client.run.xml" This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2. * Fix? * cannot figure out how to get this to go back please forgive * Fixes a network issue * leftovers * Fixes --------- Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
@@ -24,9 +24,10 @@
|
||||
delay: 5
|
||||
delayOptions: [3, 5, 10, 15, 30]
|
||||
initialBeepDelay: 0
|
||||
beepSound: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
beepSound:
|
||||
path: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
- type: StaticPrice
|
||||
price: 40
|
||||
|
||||
|
||||
@@ -252,9 +252,10 @@
|
||||
- type: OnUseTimerTrigger
|
||||
delay: 7
|
||||
initialBeepDelay: 0
|
||||
beepSound: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
beepSound:
|
||||
path: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
- type: ExplodeOnTrigger
|
||||
- type: GibOnTrigger
|
||||
deleteItems: true
|
||||
|
||||
@@ -253,9 +253,10 @@
|
||||
- type: OnUseTimerTrigger
|
||||
useVerbInstead: true
|
||||
beepInterval: .25
|
||||
beepSound: /Audio/Items/Janitor/floor_sign_beep.ogg
|
||||
params:
|
||||
volume: 1
|
||||
beepSound:
|
||||
path: /Audio/Items/Janitor/floor_sign_beep.ogg
|
||||
params:
|
||||
volume: 1
|
||||
examinable: false
|
||||
- type: Tag
|
||||
tags: # ignore "WhitelistChameleon" tag
|
||||
|
||||
@@ -24,9 +24,10 @@
|
||||
Blunt: 5
|
||||
- type: OnUseTimerTrigger
|
||||
delay: 120
|
||||
beepSound: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
beepSound:
|
||||
path: /Audio/Machines/Nuke/general_beep.ogg
|
||||
params:
|
||||
volume: -2
|
||||
- type: ExplodeOnTrigger
|
||||
- type: Explosive
|
||||
explosionType: Default
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
initialBeepDelay: 0
|
||||
beepSound:
|
||||
path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
|
||||
volume: 1
|
||||
params:
|
||||
volume: 1
|
||||
- type: RandomTimerTrigger
|
||||
min: 0
|
||||
max: 60
|
||||
|
||||
@@ -179,7 +179,6 @@
|
||||
sound:
|
||||
path: /Audio/Weapons/flash.ogg
|
||||
- type: FlashOnTrigger
|
||||
repeating: true
|
||||
range: 3
|
||||
- type: TriggerOnProximity
|
||||
enabled: true
|
||||
|
||||
Reference in New Issue
Block a user