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

Compression of Arsenal techs #2759

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+65 −46
Open

Compression of Arsenal techs #2759

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
312e867
the PR
Stop-Signs Jan 16, 2025
7dc4eb7
unfucks FTL
Stop-Signs Jan 16, 2025
12ae4e6
should be fixed
Stop-Signs Jan 17, 2025
8105fd1
yml typo
Stop-Signs Jan 17, 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
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/research/technologies.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ research-technology-portable-fission = Portable Fission
research-technology-space-scanning = Space Scanning
research-technology-excavation = Mass Excavation

research-technology-draconic-munitions = Draconic Munitions
research-technology-draconic-munitions = Exotic Munitions
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
research-technology-uranium-munitions = Uranium Munitions
research-technology-explosive-technology = Explosive Technology
research-technology-special-means = Special Means
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Nyanotrasen/Research/experimental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
recipeUnlocks:
- ClothingHeadHelmetInsulated
- ClothingHeadCage
# - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
- MagazineBoxSpecialHoly
- MagazineBoxSpecialMindbreaker
- BoxShellSoulbreaker
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved

- type: technology
id: Metempsychosis
Expand Down
55 changes: 34 additions & 21 deletions Resources/Prototypes/Research/arsenal.yml
View file
Open in desktop
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@
- MagazineBoxLightRifleIncendiary
- MagazineBoxRifleIncendiary
- MagazineBoxSpecialIncendiary # DeltaV
# DeltaV - Merges uranium and incend ammo techs, adds 38 special uranium rounds
- MagazineRifleUranium
- MagazinePistolUranium
- MagazineLightRifleUranium
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
- MagazineBoxMagnumUranium
- MagazineBoxLightRifleUranium
- MagazineBoxRifleUranium
- BoxShotgunUranium
- SpeedLoaderSpecialUranium
- MagazineBoxSpecialUranium
# End of modified code

- type: technology
id: WeaponizedLaserManipulation
Expand Down Expand Up @@ -61,28 +74,28 @@
- MagazineBoxSpecialRubber
# End of modified code

- type: technology
id: UraniumMunitions
name: research-technology-uranium-munitions
icon:
sprite: Objects/Materials/Sheets/other.rsi
state: uranium
discipline: Arsenal
tier: 2 # DeltaV moved to t2 from t1
cost: 7500
recipeUnlocks:
- MagazineRifleUranium
- MagazinePistolUranium
- MagazineLightRifleUranium
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
- MagazineBoxMagnumUranium
- MagazineBoxLightRifleUranium
- MagazineBoxRifleUranium
- BoxShotgunUranium
#- type: technology
# id: UraniumMunitions
# name: research-technology-uranium-munitions
# icon:
# sprite: Objects/Materials/Sheets/other.rsi
# state: uranium
# discipline: Arsenal
# tier: 2 # DeltaV moved to t2 from t1
# cost: 7500
# recipeUnlocks:
# - MagazineRifleUranium
# - MagazinePistolUranium
# - MagazineLightRifleUranium
# - SpeedLoaderMagnumUranium
# - MagazineBoxPistolUranium
# - MagazineBoxMagnumUranium
# - MagazineBoxLightRifleUranium
# - MagazineBoxRifleUranium
# - BoxShotgunUranium
# DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
- SpeedLoaderSpecialUranium
- MagazineBoxSpecialUranium
# - SpeedLoaderSpecialUranium
# - MagazineBoxSpecialUranium
# End of modified code

- type: technology
Expand Down
26 changes: 13 additions & 13 deletions Resources/Prototypes/_DV/Research/arsenal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Tier 2

- type: technology
id: ExoticAmmunition
name: research-technology-exotic-ammunition
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: beanbag
discipline: Arsenal
tier: 1
cost: 7500
recipeUnlocks:
- MagazineBoxSpecialHoly
- MagazineBoxSpecialMindbreaker
- BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo
#- type: technology
# id: ExoticAmmunition
# name: research-technology-exotic-ammunition
# icon:
# sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
# state: beanbag
# discipline: Arsenal
# tier: 1
# cost: 7500
# recipeUnlocks:
# - MagazineBoxSpecialHoly
# - MagazineBoxSpecialMindbreaker
# - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved

- type: technology
id: EnergyGuns
Expand Down
Loading