Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes and stuff (#229)

Browse Source 
* - add: Add rites description.

* - fix: Fix fuel tank explosion.

* - tweak: Jug can attack now.

* - tweak: Less material size.

* - fix: Translation fix.

* - tweak: Dead people are collideable.

* - tweak: Less small mobs damage.

* - add: You can now shoot yourself.

* - add: Mood effect for felinids.

* Revert "- fix: Fix fuel tank explosion."

This reverts commit 72d9d6d2c5a3e579c50e8fa63a58e6d989dbe9e9.

* - fix: Keyhole fixes.

* - tweak: Doors now cost less material.

* - fix: Change loc.
This commit is contained in:
Aviu00
2024-03-24 18:43:51 +09:00
committed by GitHub
parent 2b227be6f6
commit daffcf9a2d
19 changed files with 159 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/_White/Cult/Systems/BloodSpearSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared._White.Cult.Components;
using Content.Shared.Actions;
using Content.Shared.Examine;
using Content.Shared.Hands;
using Content.Shared.StatusEffect;
using Content.Shared.Stunnable;
@@ -23,6 +24,12 @@ public sealed class BloodSpearSystem : EntitySystem
SubscribeLocalEvent<BloodSpearComponent, ComponentRemove>(OnRemove);
SubscribeLocalEvent<BloodSpearComponent, GotEquippedHandEvent>(OnEquip);
SubscribeLocalEvent<BloodSpearComponent, ThrowDoHitEvent>(OnThrowDoHit);
SubscribeLocalEvent<BloodSpearComponent, ExaminedEvent>(OnExamine);
}
private void OnExamine(Entity<BloodSpearComponent> ent, ref ExaminedEvent args)
{
args.PushMarkup(Loc.GetString("blood-spear-component-extra-desc"));
}
private void OnThrowDoHit(Entity<BloodSpearComponent> ent, ref ThrowDoHitEvent args)

9
Content.Shared/_White/Cult/Systems/BoltBarrageSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Linq;
using Content.Shared._White.Cult.Components;
using Content.Shared.Examine;
using Content.Shared.Ghost;
using Content.Shared.Hands;
using Content.Shared.Hands.Components;
@@ -29,6 +30,12 @@ public sealed class BoltBarrageSystem : EntitySystem
SubscribeLocalEvent<BoltBarrageComponent, UnequippedHandEvent>(OnUnequipHand);
SubscribeLocalEvent<BoltBarrageComponent, ContainerGettingRemovedAttemptEvent>(OnRemoveAttempt);
SubscribeLocalEvent<BoltBarrageComponent, OnEmptyGunShotEvent>(OnEmptyShot);
SubscribeLocalEvent<BoltBarrageComponent, ExaminedEvent>(OnExamine);
}
private void OnExamine(Entity<BoltBarrageComponent> ent, ref ExaminedEvent args)
{
args.PushMarkup(Loc.GetString("bolt-barrage-component-extra-desc"));
}
private void OnUnequipHand(Entity<BoltBarrageComponent> ent, ref UnequippedHandEvent args)
@@ -51,7 +58,7 @@ public sealed class BoltBarrageSystem : EntitySystem
private void OnDrop(Entity<BoltBarrageComponent> ent, ref DroppedEvent args)
{
if (_net.IsServer)
if (_net.IsServer && ent.Comp.Unremoveable)
QueueDel(ent);
}