Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/Game.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Sandbox;
using Sandbox;
using System.Threading.Tasks;
using System.Linq;

Expand Down Expand Up @@ -128,7 +128,7 @@ public override void OnKilled( Client client, Entity pawn )
Karma.Killed( round.Players.First(x => x.GetClientOwner().SteamId == pawn.LastAttacker.GetClientOwner().SteamId ), round.Players.First( x => x.GetClientOwner().SteamId == client.SteamId ) );
if(pawn is Player)
Round?.OnPlayerKilled( pawn as Player );
base.OnKilled( client, pawn) ;
//base.OnKilled( client, pawn) ; //DO NOT SEND ANYTHING TO KILLFEED- KEEP COMMENTED OR DELETE
}
public override void ClientDisconnect( Client client, NetworkDisconnectionReason reason )
{
Expand Down
7 changes: 1 addition & 6 deletions code/Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ public enum ScoreboardGroup

[ConVar.ClientData( "ttt_spectator_mode", Help = "Spectator-only mode. True or false", Saved = true )]
public string spectatorOnlyCVar { get; set; } = "false";
public bool spectatorOnly { get {
var owner = GetClientOwner();
if ( owner == null ) return false;
string state = owner.GetUserString( "ttt_spectator_mode" );
return state == null ? false : state.ToLower() == "true";
} }
public bool spectatorOnly { get; }


[Net] public float karma { get; set; } = 1000f;
Expand Down
2 changes: 1 addition & 1 deletion code/entities/BalloonEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public override void Spawn()
SetModel( "models/citizen_props/balloonregular01.vmdl" );
SetupPhysicsFromModel( PhysicsMotionType.Dynamic, false );
PhysicsBody.GravityScale = GravityScale;
RenderColor = Color.Random.ToColor32();
RenderColor = Color.Random;
}

public override void OnKilled()
Expand Down
4 changes: 2 additions & 2 deletions code/entities/BouncyBall.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Sandbox;
using Sandbox;
using System;

[Library( "ent_bouncyball", Title = "Bouncy Ball", Spawnable = true )]
Expand All @@ -14,7 +14,7 @@ public override void Spawn()
SetModel( "models/ball/ball.vmdl" );
SetupPhysicsFromModel( PhysicsMotionType.Dynamic, false );
Scale = Rand.Float( 0.5f, 2.0f );
RenderColor = Color.Random.ToColor32();
RenderColor = Color.Random;
}

protected override void OnPhysicsCollision( CollisionEventData eventData )
Expand Down
2 changes: 1 addition & 1 deletion code/tools/Balloon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public override void Activate()

if ( Host.IsServer )
{
Tint = Color.Random.ToColor32();
Tint = Color.Random;
}
}

Expand Down
2 changes: 1 addition & 1 deletion code/ui/RagdollInspect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void Update()
break;
case Player.DeathType.Melee:
targetTexture = Texture.Load( "https://i.imgur.com/YvV5NBs.png", true );
x.SetText( "The body is bruised and battered. Clearly they were clubbes to death." );
x.SetText( "The body is bruised and battered. Clearly they were clubbed to death." );
break;
case Player.DeathType.Weapon:
targetTexture = Texture.Load( "https://i.imgur.com/eqyc9cW.png", true );
Expand Down