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.

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

Improvised shell crafting recipe #25545

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2e4eb16
Changed Projectile Sprite to Shard
FungiFellow Feb 25, 2024
f9ce87d
Removed Notes on Recipe
FungiFellow Feb 25, 2024
1cfabd7
Made Recipe
FungiFellow Feb 25, 2024
4736d69
Added a space
FungiFellow Feb 25, 2024
b9d2a3b
Update improvised.yml
FungiFellow Feb 25, 2024
002447f
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
aab2952
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
9980127
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
f82bf25
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
4e8ca47
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
885e7a4
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
8dd1cd9
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
a6d0096
Update improvised.yml
FungiFellow Feb 25, 2024
8d38bdb
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
6db3697
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
52ae951
Merge branch 'space-wizards:master' into Improvised-Shell-Crafting-Re…
FungiFellow Feb 25, 2024
b96c1c1
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
093d210
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
2bcc9b7
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
50670cf
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
995f0ea
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
f2cba55
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
709fc0c
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
3f7ae0c
Update shotgun.yml
FungiFellow Feb 25, 2024
9033121
Merge branch 'space-wizards:master' into Improvised-Shell-Crafting-Re…
FungiFellow Feb 25, 2024
0cf1e94
Removed Note
FungiFellow Feb 25, 2024
9b69bd5
Reduced needed matches from 8->6
FungiFellow Feb 25, 2024
f8671b0
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
39b298c
Matchbox fix didn't work
FungiFellow Feb 25, 2024
729b71d
Reduced glass needed from 5-4
FungiFellow Feb 25, 2024
6c311c8
Added backspace
FungiFellow Feb 25, 2024
34d3a5c
Update improvised_shotgun_shell.yml
FungiFellow Feb 25, 2024
7c34014
Added 0.5s doafter to each ingredient
FungiFellow Feb 29, 2024
9c793ad
Merge branch 'space-wizards:master' into Improvised-Shell-Crafting-Re…
FungiFellow Feb 29, 2024
b733570
Update improvised_shotgun_shell.yml
FungiFellow Feb 29, 2024
095cdbb
Update improvised_shotgun_shell.yml
FungiFellow Feb 29, 2024
383a0fb
Update improvised_shotgun_shell.yml
FungiFellow Feb 29, 2024
a5a2636
Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improv…
metalgearsloth Mar 12, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,23 @@
maxTransferAmount: 7
- type: SpentAmmoVisuals
state: "practice"

#Not yet craftable due to balance concerns. Should take a good bit of setup to create like the /tg/station recipe.
#Either the improvised shotgun or its recipe (as of July 2023) will also probably have to be nerfed if you decide to make this craftable.

- type: entity
id: ShellShotgunImprovised
name: improvised shotgun shell
description: A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
parent: BaseShellShotgun
components:
- type: Sprite
layers:
- state: improvised
map: [ "enum.AmmoVisualLayers.Base" ]
- type: Construction
graph: ImprovisedShotgunShellGraph
node: shell
- type: CartridgeAmmo
count: 10
spread: 45 #deadly if you can get up close... otherwise, good luck doing any kind of real damage
spread: 45
proto: PelletShotgunImprovised
- type: SpentAmmoVisuals
state: "improvised"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,13 @@
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
state: buckshot
state: shard
- type: Projectile
damage:
types:
Piercing: 3
Slash: 3 #remember, it's metal shrapnel!
Slash: 3


- type: entity
id: PelletShotgunTranquilizer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
- type: constructionGraph
id: ImprovisedShotgunShellGraph
start: start
graph:
- node: start
edges:
- to: shell
steps:
- material: Steel
amount: 1
doAfter: 0.5
- material: Plastic
amount: 1
doAfter: 0.5
- tag: GlassShard
name: glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 0.5
- tag: GlassShard
name: glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard2
doAfter: 0.5
- tag: GlassShard
name: glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 0.5
- tag: GlassShard
name: glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard3
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- tag: Matchstick
name: match stick
icon:
sprite: Objects/Tools/matches.rsi
state: match_unlit
doAfter: 0.5
- node: shell
entity: ShellShotgunImprovised
13 changes: 13 additions & 0 deletions Resources/Prototypes/Recipes/Crafting/improvised.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,19 @@
sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
state: icon

- type: construction
name: improvised shotgun shell
id: ShellShotgunImprovised
graph: ImprovisedShotgunShellGraph
startNode: start
targetNode: shell
category: construction-category-weapons
objectType: Item
description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: improvised

- type: construction
name: rifle stock
id: riflestock
Expand Down
Loading