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

Extended magazines #509

Merged
merged 6 commits into from
Oct 30, 2024
Merged

Conversation

imskyhappy
Copy link
Contributor

🆑 SkyHappy

  • add: Добавлены расширенные магазины

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Comment on lines 18 to 41
- type: technology # Sunrise-start
id: ExtendedAmunitions
name: research-technology-extended-amunitions
icon:
sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
state: base-b
discipline: Arsenal
tier: 2
cost: 10000
recipeUnlocks:
- BaseMagazinePistolCaselessRifleExtended
- MagazinePPSH41Extended
- MagazineMP5Extended
- MagazineMP7Extended
- MagazineP90
- MagazineM16A4Extended
- MagazineAR18Extended
- MagazineM28Extended
- MagazineG36Extended
- MagazineFamasExtended
- MagazineV31Extended
- MagazineBauer127Extended
- MagazineBR64Extended
- MagazineDragunovExtended # Sunrise-end

This comment was marked as resolved.

Copy link
Contributor

@Rinary1 Rinary1 left a comment

Choose a reason for hiding this comment

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

доделывай

Copy link
Contributor

@pxc1984 pxc1984 left a comment

Choose a reason for hiding this comment

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

Доделывай

imskyhappy

This comment was marked as off-topic.

ChappyChokolate-org and others added 3 commits October 18, 2024 20:34
	modified:   Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
	modified:   Resources/Prototypes/Research/arsenal.yml
@VigersRay VigersRay merged commit 47f72b8 into space-sunrise:master Oct 30, 2024
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants