Skip to content

Commit

Permalink
Mirror: Improvised shell crafting recipe (#165)
Browse files Browse the repository at this point in the history 
## Mirror of PR #25545: [Improvised shell crafting
recipe](space-wizards/space-station-14#25545)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `6260e4b35b829485149206636861bb7402488724`

PR opened by <img
src="https://avatars.githubusercontent.com/u/151778459?v=4"
width="16"/><a href="https://github.com/FungiFellow"> FungiFellow</a> at
2024-02-25 06:30:06 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-12 23:52:32 UTC

---

PR changed 4 files with 98 additions and 7 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> I added a Recipe for crafting Improvised Shotgun Shells, Recipe is as
follows: 1 Steel, 1 Plastic, 4 Glass Shards, and 6 Matches
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> It was added because prior there was no way to obtain ammo for your
Improvised Shotgun. There was already a Shell implemented I just added
the recipe to craft it.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/cbf68907-e710-44ee-836a-1d97e8d30372)
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - add: Added Improvised Shotgun Shell Recipe


</details>

Co-authored-by: FungiFellow <[email protected]>
  • Loading branch information
@SimpleStation14 @FungiFellow
SimpleStation14 and FungiFellow authored May 6, 2024
1 parent 9b8441f commit 8fd2d6b
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 7 deletions.
11 changes: 6 additions & 5 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
View file
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
5 changes: 3 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
View file
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
76 changes: 76 additions & 0 deletions Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
View file
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
View file
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

0 comments on commit 8fd2d6b

Please sign in to comment.