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

Roundstart Secfab Rubbers #2758

Merged
merged 2 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,20 @@
- SpeedLoaderSpecialEmpty
- SpeedLoaderSpecialPractice
- MagazinePistolSpecial
- MagazineRifleRubber
- MagazinePistolRubber
- MagazineLightRifleRubber
- SpeedLoaderMagnumRubber
- SpeedLoaderSpecialRubber
- MagazineBoxPistolRubber
- MagazineBoxMagnumRubber
- MagazineBoxLightRifleRubber
- MagazineBoxRifleRubber
- MagazineBoxSpecialRubber
- MagazineShotgunBeanbag
- BoxShellTranquilizer
- BoxBeanbag
- WeaponDisabler
# End DeltaV additions
dynamicRecipes:
- EncryptionKeySyndie # Nyano
Expand Down
41 changes: 15 additions & 26 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,21 @@
recipeUnlocks:
- WeaponLaserCarbine

- type: technology
id: NonlethalAmmunition
name: research-technology-nonlethal-ammunition
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: beanbag
discipline: Arsenal
tier: 1
cost: 5000
recipeUnlocks:
- MagazineShotgunBeanbag
- BoxShellTranquilizer
- BoxBeanbag
- WeaponDisabler
# DeltaV - rubber ammo which upstream removed
- MagazineRifleRubber
- MagazinePistolRubber
- MagazineLightRifleRubber
- SpeedLoaderMagnumRubber
- SpeedLoaderSpecialRubber
- MagazineBoxPistolRubber
- MagazineBoxMagnumRubber
- MagazineBoxLightRifleRubber
- MagazineBoxRifleRubber
- MagazineBoxSpecialRubber
# End of modified code
# DeltaV: made nonlethals roundstart, see #2758
#- type: technology
# id: NonlethalAmmunition
# name: research-technology-nonlethal-ammunition
# icon:
# sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
# state: beanbag
# discipline: Arsenal
# tier: 1
# cost: 5000
# recipeUnlocks:
# - MagazineShotgunBeanbag
# - BoxShellTranquilizer
# - BoxBeanbag
# - WeaponDisabler

- type: technology
id: UraniumMunitions
Expand Down
Loading