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

Mercfab Arsenal Recipes #2677

Merged
merged 17 commits into from
Jan 17, 2025
Merged

Mercfab Arsenal Recipes #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f0f99ea
Condensed changes into one commit
blackknight954 Jan 11, 2025
f054eb7
Merge branch 'master' into MercFabRecipes
blackknight954 Jan 11, 2025
405b335
Comment out Incend/uranium from NFSD and mercfab
blackknight954 Jan 11, 2025
5227090
Merge branch 'MercFabRecipes' of https://github.com/blackknight954/fr…
blackknight954 Jan 11, 2025
a1e8afa
resolved issues
blackknight954 Jan 11, 2025
b390d7f
Merge branch 'master' into MercFabRecipes
blackknight954 Jan 11, 2025
aa64064
Update lathe.yml
dvir001 Jan 16, 2025
7f73d5e
Update lathe.yml
dvir001 Jan 16, 2025
25a088b
Update lathe.yml
dvir001 Jan 16, 2025
e22d15b
Update lathe.yml
dvir001 Jan 17, 2025
f15c420
Update arsenal.yml
dvir001 Jan 17, 2025
e45debc
Update arsenal.yml
dvir001 Jan 17, 2025
5865e2d
Merge branch 'master' into MercFabRecipes
dvir001 Jan 17, 2025
135a316
Update lathe.yml
dvir001 Jan 17, 2025
0d3aa22
Merge branch 'master' into MercFabRecipes
dvir001 Jan 17, 2025
080c460
Update arsenal.yml
dvir001 Jan 17, 2025
0f98f35
Merge branch 'master' into MercFabRecipes
dvir001 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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Research/arsenal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
- MagazinePistolIncendiary
- MagazineLightRifleIncendiary
- SpeedLoaderMagnumIncendiary
- SpeedLoaderRifleHeavyIncendiary # Frontier
- MagazineShotgunIncendiary
- MagazineBoxPistolIncendiary
- MagazineBoxMagnumIncendiary
- MagazineBoxLightRifleIncendiary
- MagazineBoxRifleIncendiary
# - SpeedLoaderRifleHeavyIncendiary # Frontier

- type: technology
id: WeaponizedLaserManipulation
Expand Down Expand Up @@ -85,12 +85,12 @@
- MagazinePistolUranium
- MagazineLightRifleUranium
- SpeedLoaderMagnumUranium
- SpeedLoaderRifleHeavyUranium # Frontier
- MagazineBoxPistolUranium
- MagazineBoxMagnumUranium
- MagazineBoxLightRifleUranium
- MagazineBoxRifleUranium
- BoxShotgunUranium
# - SpeedLoaderRifleHeavyUranium # Frontier

- type: technology
id: AdvancedRiotControl
Expand Down
65 changes: 43 additions & 22 deletions Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,14 +562,31 @@
- HoloprojectorNfsd
- ClothingBackpackElectropack
dynamicRecipes:
- BoxShotgunIncendiary
- BoxShotgunUranium
- BoxShellTranquilizer
- ExplosivePayload
- FlashPayload
- GrenadeBlast
- GrenadeEMP
- GrenadeFlash
- PortableRecharger
- PowerCageHigh
- PowerCageMedium
- PowerCageSmall
- Signaller
- SignalTrigger
- TelescopicShield
- TimerTrigger
- Truncheon
- VoiceTrigger
- WeaponAdvancedLaser
- WeaponDisablerSMG
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxShotgunIncendiary
- BoxShotgunUranium
- MagazineBoxLightRifleIncendiary
- MagazineBoxLightRifleUranium
- MagazineBoxMagnumIncendiary
Expand All @@ -586,27 +603,8 @@
- MagazineRifleIncendiary
- MagazineRifleUranium
- MagazineShotgunIncendiary
- PortableRecharger
- PowerCageHigh
- PowerCageMedium
- PowerCageSmall
- ShuttleGunDusterCircuitboard
- ShuttleGunFriendshipCircuitboard
- ShuttleGunPerforatorCircuitboard
- ShuttleGunSvalinnMachineGunCircuitboard
- Signaller
- SignalTrigger
- SpeedLoaderMagnumIncendiary
- SpeedLoaderMagnumUranium
- TelescopicShield
- TimerTrigger
- Truncheon
- VoiceTrigger
- WeaponAdvancedLaser
- WeaponDisablerSMG
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- SpeedLoaderRifleHeavyIncendiary
- SpeedLoaderRifleHeavyUranium

Expand Down Expand Up @@ -823,7 +821,6 @@
- WeaponAntiqueLaserNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
- WeaponLaserCarbine
- WeaponDisabler
## Mags / Speedloaders / Clips
## Ammo boxes
- BoxBeanbag
- BoxShellTranquilizer
Expand All @@ -832,6 +829,30 @@
- MagazineBoxPistolRubber
- MagazineBoxRifleRubber
- MagazineShotgunBeanbag
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxShotgunIncendiary
- BoxShotgunUranium
- MagazineBoxLightRifleIncendiary
- MagazineBoxLightRifleUranium
- MagazineBoxMagnumIncendiary
- MagazineBoxMagnumUranium
- MagazineBoxPistolIncendiary
- MagazineBoxPistolUranium
- MagazineBoxRifleIncendiary
- MagazineBoxRifleUranium
- MagazineGrenadeEmpty
- MagazineLightRifleIncendiary
- MagazineLightRifleUranium
- MagazinePistolIncendiary
- MagazinePistolUranium
- MagazineRifleIncendiary
- MagazineRifleUranium
- MagazineShotgunIncendiary
- SpeedLoaderMagnumIncendiary
- SpeedLoaderMagnumUranium
- SpeedLoaderRifleHeavyIncendiary
- SpeedLoaderRifleHeavyUranium

- type: entity
id: MercenaryTechFabHacked
Expand Down
Loading