Skip to content

Commit

Permalink
Fixes (#58)
Browse files Browse the repository at this point in the history
* Fixes

* fix stuff

* awawawawaw

* skibidi toilet

* add to rotation
  • Loading branch information
Simyon264 authored Dec 27, 2024
1 parent b3dee7d commit cde7616
Show file tree
Hide file tree
Showing 10 changed files with 30,252 additions and 30,075 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
using Content.Shared.Security.Components;
using Robust.Shared.Prototypes;
using Content.Shared.CombatMode.Pacification;
using Content.Shared.Temperature.Components;
using Robust.Shared.Audio;

namespace Content.Server._SSS.SuspicionGameRule;
Expand Down Expand Up @@ -350,6 +351,7 @@ private void OnBeforeSpawn(PlayerBeforeSpawnEvent ev)
// Rounds only last like 5 minutes, so players shouldn't need to eat or drink.
RemComp<ThirstComponent>(mob);
RemComp<HungerComponent>(mob);
RemComp<TemperatureSpeedComponent>(mob);

EnsureComp<ShowCriminalRecordIconsComponent>(mob); // Hijacking criminal records for the blue "D" symbol.

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Chasm/ChasmFallingComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ public sealed partial class ChasmFallingComponent : Component
/// <summary>
/// Scale that the animation should bring entities to.
/// </summary>
public Vector2 AnimationScale = new Vector2(0.01f, 0.01f);
public Vector2 AnimationScale = new Vector2(0.2f, 0.2f);
}
13 changes: 12 additions & 1 deletion Content.Shared/Chasm/ChasmSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Buckle.Components;
using Content.Shared.Damage;
using Content.Shared.Item;
using Content.Shared.Movement.Events;
using Content.Shared.StepTrigger.Systems;
using Robust.Shared.Audio;
Expand All @@ -19,6 +21,7 @@ public sealed class ChasmSystem : EntitySystem
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly DamageableSystem _damageable = default!;

public override void Initialize()
{
Expand All @@ -43,7 +46,15 @@ public override void Update(float frameTime)
if (_timing.CurTime < chasm.NextDeletionTime)
continue;

QueueDel(uid);
chasm.NextDeletionTime = TimeSpan.MaxValue;

if (!TryComp<ItemComponent>(uid, out var item))
RemComp<ItemComponent>(uid);

if (!TryComp<DamageableComponent>(uid, out var damageableComponent))
return;
//QueueDel(uid); SSS: KILL INSTEAD
_damageable.SetAllDamage(uid, damageableComponent, 1000);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Explosion/ExplosionPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public sealed partial class ExplosionPrototype : IPrototype
/// explosion intensity to a tile break chance via linear interpolation.
/// </summary>
[DataField("tileBreakChance")]
private float[] _tileBreakChance = { 0f, 1f };
private float[] _tileBreakChance = { 0f};

/// <summary>
/// This set of points, together with <see cref="_tileBreakChance"/> define a function that maps the
Expand Down
59,669 changes: 29,984 additions & 29,685 deletions Resources/Maps/_SSS/crashed-reach-sss.yml

Large diffs are not rendered by default.

Loading

0 comments on commit cde7616

Please sign in to comment.