-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mystabible, Shockcollar, Fish Labeler, Tinfoil craft (#112)
* Mysta Bible * fish labeler * tinfoil construction * shock collar and soulbreaker research * tinfoil graph --------- Signed-off-by: Fluffiest Floofers <[email protected]>
- Loading branch information
1 parent
d105dad
commit 725c742
Showing
13 changed files
with
123 additions
and
2 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.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,6 @@ | ||
namespace Content.Server.ShockCollar; | ||
|
||
[RegisterComponent] | ||
public sealed partial class ShockCollarComponent : Component | ||
{} | ||
|
31 changes: 31 additions & 0 deletions
31
Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.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,31 @@ | ||
using Content.Shared.Mobs.Components; | ||
using Content.Server.Explosion.EntitySystems; // Why is trigger under explosions by the way? Even doors already use it. | ||
using Content.Server.Electrocution; | ||
using Robust.Shared.Containers; | ||
|
||
namespace Content.Server.ShockCollar; | ||
|
||
public sealed partial class ShockCollarSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly SharedContainerSystem _container = default!; | ||
[Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!; | ||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
SubscribeLocalEvent<ShockCollarComponent, TriggerEvent>(OnTrigger); | ||
} | ||
|
||
private void OnTrigger(EntityUid uid, ShockCollarComponent component, TriggerEvent args) | ||
{ | ||
if (!_container.TryGetContainingContainer(uid, out var container)) // Try to get the entity directly containing this | ||
return; | ||
|
||
var containerEnt = container.Owner; | ||
|
||
if (!HasComp<MobStateComponent>(containerEnt)) // If it's not a mob we don't care | ||
return; | ||
|
||
_electrocutionSystem.TryDoElectrocution(containerEnt, null, 5, TimeSpan.FromSeconds(2), true); | ||
} | ||
} | ||
|
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
20 changes: 20 additions & 0 deletions
20
Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.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,20 @@ | ||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ShockCollar | ||
name: shock collar | ||
description: Shocking. Placeholder sprite. | ||
components: | ||
- type: Sprite | ||
sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi | ||
- type: Clothing | ||
sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi | ||
- type: ShockCollar | ||
- type: TriggerOnSignal | ||
- type: DeviceNetwork | ||
deviceNetId: Wireless | ||
receiveFrequencyId: BasicDevice | ||
- type: WirelessNetworkConnection | ||
range: 200 | ||
- type: DeviceLinkSink | ||
ports: | ||
- Trigger |
14 changes: 14 additions & 0 deletions
14
Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.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,14 @@ | ||
- type: entity | ||
parent: Bible | ||
id: BibleMystagogue | ||
name: book of mysteries | ||
description: The mystagogue's holy book. | ||
components: | ||
- type: Summonable | ||
specialItem: SpawnPointGhostIfrit | ||
- type: Sprite | ||
sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi | ||
state: icon | ||
- type: Item | ||
size: 15 | ||
sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi |
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
Binary file added
BIN
+351 Bytes
Resources/Textures/Nyanotrasen/Objects/Specific/Chapel/holylight.rsi/icon.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
+889 Bytes
...rces/Textures/Nyanotrasen/Objects/Specific/Chapel/holylight.rsi/inhand-left.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.01 KB
...ces/Textures/Nyanotrasen/Objects/Specific/Chapel/holylight.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/Nyanotrasen/Objects/Specific/Chapel/holylight.rsi/meta.json
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,22 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |