aboutsummaryrefslogtreecommitdiff
path: root/Northstar.CustomServers
diff options
context:
space:
mode:
authorGalacticMoblin <100473309+GalacticMoblin@users.noreply.github.com>2023-01-03 02:16:33 +0000
committerGitHub <noreply@github.com>2023-01-03 02:16:33 +0000
commita203eea6c3129c1572e760e943b5b97cab1f20c0 (patch)
treee902c33eb346c7c9f1a4835c9d3fa0bb2f8561ae /Northstar.CustomServers
parent27e000e3feb3741c91708ea47c92ec95d9f3d4d1 (diff)
downloadNorthstarMods-a203eea6c3129c1572e760e943b5b97cab1f20c0.tar.gz
NorthstarMods-a203eea6c3129c1572e760e943b5b97cab1f20c0.zip
Fixed Multiple Amped Weapons Timers (#500)
* Add files via upload * Delete _burnmeter.gnut * Add files via upload Fixed multiple Amped Weapon uses not resetting the timer * Add eject quotes (#527) * Upload cl_titan_cockpit.nut * Add eject string in script * Moved to client * index issue + removed else so always returns * Apply suggestions from code review Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> * Rest of the suggestions because github makes me want to cry * Commit suggestions from review GitHub really hates batching suggestions Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> * Add files via upload * Delete _burnmeter.gnut * Rename _burnmeter.gnut.txt to _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut Co-authored-by: JMM889901 <41163714+JMM889901@users.noreply.github.com> Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
Diffstat (limited to 'Northstar.CustomServers')
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut6
1 files changed, 5 insertions, 1 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
index 81f7fbc2a..5821d0150 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
@@ -294,10 +294,14 @@ void function InitBurnMeterPersistentData( entity player )
void function PlayerUsesAmpedWeaponsBurncard( entity player )
{
thread PlayerUsesAmpedWeaponsBurncardThreaded( player )
+
}
void function PlayerUsesAmpedWeaponsBurncardThreaded( entity player )
{
+ player.Signal( "StopAmpedWeapons" )
+ player.EndSignal("StopAmpedWeapons")
+
array<entity> weapons = player.GetMainWeapons()
//weapons.extend( player.GetOffhandWeapons() ) // idk? unsure of vanilla behaviour here
foreach ( entity weapon in weapons )
@@ -606,4 +610,4 @@ void function PlayerUsesReaperfallBurncard( entity player )
DispatchSpawn( reaper )
thread SuperSpectre_WarpFall( reaper )
-} \ No newline at end of file
+}