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

Increase Blast Grenade Recipe Cost and Add Research Requirement #27580

Merged
merged 3 commits into from
May 3, 2024
Merged

Increase Blast Grenade Recipe Cost and Add Research Requirement #27580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5486d80
Adjust blast grenade recipe
May 1, 2024
b05aaba
Move blast grenades into tier 2 research
May 1, 2024
38b3d25
Move blast grenades to dynamic recipes for secfab and autolathe
May 1, 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
12 changes: 3 additions & 9 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
emagStaticRecipes:
- BoxLethalshot
- BoxShotgunFlare
- GrenadeBlast
- MagazineBoxLightRifle
- MagazineBoxMagnum
- MagazineBoxPistol
Expand All @@ -187,6 +186,7 @@
- BoxBeanbag
- BoxShotgunIncendiary
- BoxShotgunUranium
- GrenadeBlast
- GrenadeEMP
- GrenadeFlash
- MagazineBoxLightRifleIncendiary
Expand Down Expand Up @@ -711,6 +711,7 @@
- BoxShotgunUranium
- ExplosivePayload
- FlashPayload
- GrenadeBlast
- GrenadeEMP
- GrenadeFlash
- HoloprojectorSecurity
Expand All @@ -731,6 +732,7 @@
- MagazineRifleUranium
- MagazineShotgunBeanbag
- MagazineShotgunIncendiary
- PortableRecharger
- PowerCageHigh
- PowerCageMedium
- PowerCageSmall
Expand All @@ -753,14 +755,6 @@
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- PowerCageSmall
- PowerCageMedium
- PowerCageHigh
- ShuttleGunSvalinnMachineGunCircuitboard
- ShuttleGunPerforatorCircuitboard
- ShuttleGunFriendshipCircuitboard
- ShuttleGunDusterCircuitboard
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you intend to remove all of these?

Copy link
Contributor Author

@Plykiya Plykiya May 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

"I also deleted some recipes in the secfab that were duplicated for some reason and moved PortableRechargers up to where they should be alphabetically"

Yes!

- PortableRecharger
- type: MaterialStorage
whitelist:
tags:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Recipes/Lathes/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,9 +678,9 @@
result: GrenadeBlast
completetime: 3
materials:
Steel: 150
Plastic: 100
Gold: 50
Steel: 450
Plastic: 300
Gold: 150

- type: latheRecipe
id: GrenadeFlash
Expand All @@ -700,4 +700,4 @@
Uranium: 2000
Plastic: 1000
Plasma: 500
Glass: 500
Glass: 500
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/arsenal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
- PowerCageMedium
- MagazineGrenadeEmpty
- GrenadeFlash
- GrenadeBlast
- ShuttleGunSvalinnMachineGunCircuitboard
- ShuttleGunPerforatorCircuitboard
- ShuttleGunFriendshipCircuitboard
Expand Down
Loading