aboutsummaryrefslogtreecommitdiff
path: root/Northstar.CustomServers/mod/scripts
diff options
context:
space:
mode:
authorGalacticMoblin <100473309+GalacticMoblin@users.noreply.github.com>2023-01-03 02:16:33 +0000
committerGeckoEidechse <gecko.eidechse+git@pm.me>2023-01-04 13:38:58 +0100
commit4fc12101705aa784cc0022cdff948a35eec1f707 (patch)
treebf40f5d01be4f57aa5a3ecc988bf3e997a856355 /Northstar.CustomServers/mod/scripts
parent6c22ed7b6d508c514b589159837b2ccd64441db1 (diff)
downloadNorthstarMods-4fc12101705aa784cc0022cdff948a35eec1f707.tar.gz
NorthstarMods-4fc12101705aa784cc0022cdff948a35eec1f707.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/mod/scripts')
-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 81f7fbc2..5821d015 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
+}