Skip to content
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.

Sign up for GitHub

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

Hotfix explosive bolt being craftable via anything with Comp Explosive #2976

Merged
merged 9 commits into from
Feb 25, 2025
Merged

Hotfix explosive bolt being craftable via anything with Comp Explosive #2976

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f2ff29
Hotfix explosive bolt being craftable via anything with Comp Explosive
nathan736 Feb 24, 2025
f7736f1
added # Frontier in relevent area's and changed tag to be more obviou…
nathan736 Feb 24, 2025
86e59d5
Revert "added # Frontier in relevent area's and changed tag to be mor…
nathan736 Feb 24, 2025
d69d2b3
Revert "Hotfix explosive bolt being craftable via anything with Comp …
nathan736 Feb 24, 2025
e4ba03d
Now acomplished Via a NFexplosivecraftingcomponent
nathan736 Feb 24, 2025
148e9ab
Merge branch 'master' into Explosive-Bolt-crafting-Hotfix
dvir001 Feb 24, 2025
fe0039b
NFExplosivecrafting to NFFireBomb
whatston3 Feb 25, 2025
389f39e
Merge branch 'master' into Explosive-Bolt-crafting-Hotfix
whatston3 Feb 25, 2025
c8228cf
Merge branch 'master' into Explosive-Bolt-crafting-Hotfix
dvir001 Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Content.Server/_NF/Whitelist/Components/NFExplosivecraftingComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Server._NF.Whitelist.Components;

/// <summary>
/// Whitelist component for crafting explosive arrow bolts
/// </summary>
[RegisterComponent]
public sealed partial class NFExplosivecraftingComponent : Component;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not put the comp in shared? @whatston3

Copy link
Contributor

@whatston3 whatston3 Feb 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could move all of the whitelist components into shared, and it's probably a good idea. At the moment, the only time this would get used is in a construction graph with a ghost, which we do not have.

Works as-is, but might break if construction graphs are moved to be more predicted.

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
name: fire bomb
description: A weak, improvised incendiary device.
components:
- type: NFExplosivecrafting
- type: WeaponCaseInsertable # Frontier
- type: Sprite
sprite: Objects/Weapons/Bombs/ied.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: constructionGraph
- type: constructionGraph
id: CraftCrossbowBoltGlassShard
start: start
graph:
Expand Down Expand Up @@ -127,7 +127,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: base
doAfter: 1
- component: Explosive
- component: NFExplosivecrafting
name: Firebomb
icon:
sprite: Objects/Weapons/Bombs/ied.rsi
Expand Down
Loading