-
Notifications
You must be signed in to change notification settings - Fork 340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mystabible, Shockcollar, Fish Labeler, Tinfoil craft #112
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
bf77f25
Mysta Bible
FluffiestFloof b685f11
fish labeler
FluffiestFloof bbe2865
tinfoil construction
FluffiestFloof 99e8b53
shock collar and soulbreaker research
FluffiestFloof 4908146
Merge branch 'master' into mystabible
FluffiestFloof e00eb29
tinfoil graph
FluffiestFloof f8b5591
Merge branch 'master' into mystabible
FluffiestFloof f2054de
Merge branch 'DeltaV-Station:master' into mystabible
FluffiestFloof 3ab5775
Merge branch 'master' into mystabible
FluffiestFloof c8e0e5b
Merge branch 'DeltaV-Station:master' into mystabible
FluffiestFloof File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 | ||
} | ||
] | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you intend to leave this line commented out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I moved it to another research during the creation of the .38 ammo type because it fit the whole "exotic ammo".
https://github.com/DeltaV-Station/Delta-v-rebase/blob/9b91b2b2edea2124f2c0b8509c20493d6f9c8418/Resources/Prototypes/DeltaV/Research/arsenal.yml#L4-L15
It's in this PR uncommented. I can move it back to this research if wanted.