Skip to content

Commit

Permalink
Finally done
Browse files Browse the repository at this point in the history
  • Loading branch information
VMSolidus committed Jul 22, 2024
1 parent fff7343 commit aac680c
Show file tree
Hide file tree
Showing 157 changed files with 595 additions and 439 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Content.Server.SimpleStation14.Silicon.Death;
using Content.Server.Sound.Components;
using Content.Shared.Sound.Components;
using Content.Shared.Mobs;
using Content.Shared.SimpleStation14.Silicon.Systems;

Expand All @@ -18,11 +18,7 @@ private void OnDeath(EntityUid uid, SiliconEmitSoundOnDrainedComponent component
{
var spamComp = EnsureComp<SpamEmitSoundComponent>(uid);

spamComp.Accumulator = 0f;
spamComp.RollInterval = component.Interval;
spamComp.PlayChance = component.PlayChance;
spamComp.PopUp = component.PopUp;
spamComp.Enabled = true;
spamComp.Sound = component.Sound;
}

Expand Down
8 changes: 7 additions & 1 deletion Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,13 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
if (!rayCastResults.Any())
break;

var result = rayCastResults[0];
var raycastEvent = new HitScanAfterRayCastEvent(rayCastResults);
RaiseLocalEvent(lastUser, ref raycastEvent);

if (raycastEvent.RayCastResults == null)
break;

var result = raycastEvent.RayCastResults[0];
var hit = result.HitEntity;
lastHit = hit;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Robust.Shared.GameStates;

namespace Content.Shared.Teleportation.Components;

[RegisterComponent, NetworkedComponent]
public sealed partial class PortalExemptComponent : Component
{
}
5 changes: 4 additions & 1 deletion Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Shared.Ghost;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
Expand Down Expand Up @@ -83,6 +83,9 @@ private bool ShouldCollide(string ourId, string otherId, Fixture our, Fixture ot

private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollideEvent args)
{
if (HasComp<PortalExemptComponent>(args.OtherEntity))
return;

if (!ShouldCollide(args.OurFixtureId, args.OtherFixtureId, args.OurFixture, args.OtherFixture))
return;

Expand Down
17 changes: 17 additions & 0 deletions Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Robust.Shared.Physics;

namespace Content.Shared.Weapons.Ranged.Events;

/// <summary>
/// Raised after an entity fires a hitscan weapon, but before the list is truncated to the first target. Necessary for Entities that need to prevent friendly fire
/// </summary>
[ByRefEvent]
public struct HitScanAfterRayCastEvent
{
public List<RayCastResults>? RayCastResults;

public HitScanAfterRayCastEvent(List<RayCastResults>? rayCastResults)
{
RayCastResults = rayCastResults;
}
}
39 changes: 39 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Delta-V - This file is licensed under AGPLv3
# Copyright (c) 2024 Delta-V Contributors
# See AGPLv3.txt for details.

- type: entity
save: false
name: Urist McNoodle
parent: MobLamiaBase
id: MobLamia
description: A miserable pile of scales.
components:
- type: CombatMode
- type: InteractionPopup
successChance: 1
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- type: Mind
- type: Input
context: "human"
- type: MobMover
- type: InputMover
- type: Respirator
damage:
types:
Asphyxiation: 1.5
damageRecovery:
types:
Asphyxiation: -1.5
- type: Alerts
- type: Actions
- type: Eye
- type: CameraRecoil
- type: Examiner
- type: CanHostGuardian
- type: NpcFactionMember
factions:
- NanoTrasen
- type: PotentialPsionic
204 changes: 0 additions & 204 deletions Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml

This file was deleted.

7 changes: 0 additions & 7 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# Traitor single items

- type: stealTargetGroup
id: SupermatterSliver
name: supermatter sliver
sprite:
sprite: Supermatter/supermatter_sliver.rsi
state: icon

- type: stealTargetGroup
id: Hypospray
name: hypospray
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Traits/skills.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
requirements:
- !type:CharacterJobRequirement
inverted: true
jobs:
- Borg
- MedicalBorg
- !type:CharacterTraitRequirement
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
- type: Tag
id: AirSensor

- type: Tag
id: AllowLamiaHardsuit

- type: Tag
id: Ambrosia

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
"name": "inhand-right",
"directions": 4
},
{
"name": "segment"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit aac680c

Please sign in to comment.