-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
157 changed files
with
595 additions
and
439 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
Content.Shared/Teleportation/Components/PortalExemptComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
{ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
39
Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
204
Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,9 @@ | |
- type: Tag | ||
id: AirSensor | ||
|
||
- type: Tag | ||
id: AllowLamiaHardsuit | ||
|
||
- type: Tag | ||
id: Ambrosia | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+372 Bytes
.../Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.73 KB
...uterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.