Skip to content

Commit cbf556e

Browse files
authored
Add more brass ammo calibers (#1010)
* Add more brass ammo calibers * Fix sprite path separators in Materials.yml * Add deleteOnSpawn property to cartridge ammo components Added 'deleteOnSpawn' property to various cartridge ammo components. * Update icon paths for bullet casing materials * Deleted a result of my spelling mistakes Im sorry, im dumb ;-;
1 parent 7a03af3 commit cbf556e

11 files changed

Lines changed: 1399 additions & 1 deletion

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,20 @@
11
cartridge-9x19mm-hi-power = Made of premium materials. Much more powerful.
22
cartridge-9x19mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
3+
cartridge-45_ACP-hi-power = Made of premium materials. Much more powerful.
4+
cartridge-45_ACP-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
5+
cartridge-46x30mm-hi-power = Made of premium materials. Much more powerful.
6+
cartridge-46x30mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
7+
cartridge-45_magnum-hi-power = Made of premium materials. Much more powerful.
8+
cartridge-45_magnum-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
9+
cartridge-556x45mm-hi-power = Made of premium materials. Much more powerful.
10+
cartridge-556x45mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
11+
cartridge-57x28mm-hi-power = Made of premium materials. Much more powerful.
12+
cartridge-57x28mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
13+
cartridge-762x39mm-hi-power = Made of premium materials. Much more powerful.
14+
cartridge-762x39mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
15+
cartridge-762x51mm-hi-power = Made of premium materials. Much more powerful.
16+
cartridge-762x51mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
17+
cartridge-762x54mmR-hi-power = Made of premium materials. Much more powerful.
18+
cartridge-762x54mmR-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.
19+
cartridge-8x65mmSKR-hi-power = Made of premium materials. Much more powerful.
20+
cartridge-8x65mmSKR-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing.

Resources/Locale/en-US/_HL/recipes/materials.ftl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,13 @@ stack-Capital-Frame = capital ship weapon frame
1111
stack-Capital-Servo = capital ship weapon servo
1212
stack-Capital-Internal = capital ship weapon internal
1313
stack-bullet-casing-9x19mm = brass casing (9x19mm)
14+
stack-bullet-casing-45_ACP = brass casing (45 ACP)
15+
stack-bullet-casing-46x30mm = brass casing (46x30mm)
16+
stack-bullet-casing-45_magnum = brass casing (45 magnum)
17+
stack-bullet-casing-556x45mm = brass casing (556x45mm)
18+
stack-bullet-casing-57x28mm = brass casing (57x28mm)
19+
stack-bullet-casing-762x39mm = brass casing (762x39mm)
20+
stack-bullet-casing-762x51mm = brass casing (762x51mm)
21+
stack-bullet-casing-762x54mmR = brass casing (762x54mmR)
22+
stack-bullet-casing-8x65mmSKR = brass casing (8x65mm SKR)
1423
stack-bullet-flechette = flechette(s)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
stack-hi-power-gunpowder = triple-base gunpowder
22
stack-bullet-tip = bullet tip(s)
33
stack-bullet-casings-9x19mm = brass casing(s) (9x19mm)
4+
stack-bullet-casings-45_ACP = brass casing(s) (45 ACP)
5+
stack-bullet-casings-46x30mm = brass casing(s) (46x30mm)
6+
stack-bullet-casings-45_magnum = brass casing(s) (45 magnum)
7+
stack-bullet-casings-556x45mm = brass casing(s) (556x45mm)
8+
stack-bullet-casings-57x28mm = brass casing(s) (57x28mm)
9+
stack-bullet-casings-762x39mm = brass casing(s) (762x39mm)
10+
stack-bullet-casings-762x51mm = brass casing(s) (762x51mm)
11+
stack-bullet-casings-762x54mmR = brass casing(s) (762x54mmR)
12+
stack-bullet-casings-8x65mmSKR = brass casing(s) (8x65mm SKR)

Resources/Prototypes/_HL/Entities/Objects/Materials/Materials.yml

Lines changed: 172 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,178 @@
638638
Brass: 10
639639
- type: Item
640640
size: Tiny
641-
641+
642+
- type: entity
643+
parent: MaterialBase
644+
id: MaterialBulletCasing45_ACP
645+
name: brass casing (45 ACP)
646+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 45 ACP.
647+
components:
648+
- type: Material
649+
- type: Stack
650+
stackType: BulletCasing45_ACP
651+
count: 1
652+
- type: Sprite
653+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
654+
state: base-spent
655+
- type: PhysicalComposition
656+
materialComposition:
657+
Brass: 10
658+
- type: Item
659+
size: Tiny
660+
661+
- type: entity
662+
parent: MaterialBase
663+
id: MaterialBulletCasing46x30mm
664+
name: brass casing (46x30mm)
665+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 46x30mm.
666+
components:
667+
- type: Material
668+
- type: Stack
669+
stackType: BulletCasing46x30mm
670+
count: 1
671+
- type: Sprite
672+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
673+
state: base-spent
674+
- type: PhysicalComposition
675+
materialComposition:
676+
Brass: 10
677+
- type: Item
678+
size: Tiny
679+
680+
- type: entity
681+
parent: MaterialBase
682+
id: MaterialBulletCasing45_magnum
683+
name: brass casing (45 magnum)
684+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 45 magnum.
685+
components:
686+
- type: Material
687+
- type: Stack
688+
stackType: BulletCasing45_magnum
689+
count: 1
690+
- type: Sprite
691+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
692+
state: base-spent
693+
- type: PhysicalComposition
694+
materialComposition:
695+
Brass: 30
696+
- type: Item
697+
size: Tiny
698+
699+
- type: entity
700+
parent: MaterialBase
701+
id: MaterialBulletCasing556x45mm
702+
name: brass casing (556x45mm)
703+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 556x45mm.
704+
components:
705+
- type: Material
706+
- type: Stack
707+
stackType: BulletCasing556x45mm
708+
count: 1
709+
- type: Sprite
710+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
711+
state: base-spent
712+
- type: PhysicalComposition
713+
materialComposition:
714+
Brass: 10
715+
- type: Item
716+
size: Tiny
717+
718+
- type: entity
719+
parent: MaterialBase
720+
id: MaterialBulletCasing57x28mm
721+
name: brass casing (57x28mm)
722+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 57x28mm.
723+
components:
724+
- type: Material
725+
- type: Stack
726+
stackType: BulletCasing57x28mm
727+
count: 1
728+
- type: Sprite
729+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
730+
state: base-spent
731+
- type: PhysicalComposition
732+
materialComposition:
733+
Brass: 10
734+
- type: Item
735+
size: Tiny
736+
737+
- type: entity
738+
parent: MaterialBase
739+
id: MaterialBulletCasing762x39mm
740+
name: brass casing (762x39mm)
741+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x39mm.
742+
components:
743+
- type: Material
744+
- type: Stack
745+
stackType: BulletCasing762x39mm
746+
count: 1
747+
- type: Sprite
748+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
749+
state: base-spent
750+
- type: PhysicalComposition
751+
materialComposition:
752+
Brass: 20
753+
- type: Item
754+
size: Tiny
755+
756+
- type: entity
757+
parent: MaterialBase
758+
id: MaterialBulletCasing762x51mm
759+
name: brass casing (762x51mm)
760+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x51mm.
761+
components:
762+
- type: Material
763+
- type: Stack
764+
stackType: BulletCasing762x51mm
765+
count: 1
766+
- type: Sprite
767+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
768+
state: base-spent
769+
- type: PhysicalComposition
770+
materialComposition:
771+
Brass: 20
772+
- type: Item
773+
size: Tiny
774+
775+
- type: entity
776+
parent: MaterialBase
777+
id: MaterialBulletCasing762x54mmR
778+
name: brass casing (762x54mmR)
779+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x54mmR.
780+
components:
781+
- type: Material
782+
- type: Stack
783+
stackType: BulletCasing762x54mmR
784+
count: 1
785+
- type: Sprite
786+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
787+
state: base-spent
788+
- type: PhysicalComposition
789+
materialComposition:
790+
Brass: 30
791+
- type: Item
792+
size: Tiny
793+
794+
- type: entity
795+
parent: MaterialBase
796+
id: MaterialBulletCasing8x65mmSKR
797+
name: brass casing (8x65mm SKR)
798+
description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 8x65mmSKR.
799+
components:
800+
- type: Material
801+
- type: Stack
802+
stackType: BulletCasing9x19mm
803+
count: 1
804+
- type: Sprite
805+
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
806+
state: base-spent
807+
- type: PhysicalComposition
808+
materialComposition:
809+
Brass: 30
810+
- type: Item
811+
size: Tiny
812+
642813
- type: entity
643814
parent: MaterialBase
644815
id: MaterialBulletFlechette

0 commit comments

Comments
 (0)