OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Merge branch 'devel' into experimental

Browse source
This commit is contained in:
Marisa the Magician 2019-08-02 10:02:39 +02:00
commit 62b8975991
69 changed files with 2597 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zscript/biorifle.zsc
View file

@ -91,6 +91,7 @@ Class BioHitbox : Actor
+NOCLIP;
+DONTSPLASH;
+NOBLOOD;
+NOTELEPORT;
}
override void PostBeginPlay()
{
@ -823,6 +824,8 @@ Class BioRifle : UTWeapon
invoker.charge = min(5.1,invoker.charge+0.1);
A_Overlay(-9999,null);
A_WeaponOffset(0,32); // fix sudden psprite lowering
if ( self is 'UTPlayer' )
UTPlayer(self).PlayAttacking3();
}
BIOF A 2 A_BioFire(true);
BIOF BCDEFGHI 2;