Fixes and stuff (#229)
* - 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:
@@ -190,6 +190,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem
|
||||
|
||||
private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args)
|
||||
{
|
||||
// Shoot yourself!
|
||||
if (args.OtherEntity == component.Target) // WD
|
||||
return;
|
||||
|
||||
if (component.IgnoreShooter && (args.OtherEntity == component.Shooter || args.OtherEntity == component.Weapon))
|
||||
{
|
||||
args.Cancelled = true;
|
||||
@@ -356,4 +360,4 @@ public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target
|
||||
/// Raised after a projectile has dealt it's damage.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, Fixture Fixture);
|
||||
public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, Fixture Fixture);
|
||||
|
||||
Reference in New Issue
Block a user