Skip to content

Commit 3240d26

Browse files
authored
Garand Ping (#2399)
# Description Adds the iconic Garand Ping to the Mark 1 Rifles Changes it so Mark 1 Rifles are now Rifle Parent instead of Sniper Changed it so it uses a en-block magazine (nightmare coding) which you can print from sec, ammo and emagged autolathe. Thanks to @ItsDzordz for making sure it didn't explode and testing. # Changelog :cl: - add: PING --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au>
1 parent ce253a3 commit 3240d26

File tree

8 files changed

+125
-18
lines changed

8 files changed

+125
-18
lines changed
Binary file not shown.
Binary file not shown.

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
contents:
77
- id: WeaponSniperGrand
88
amount: 2
9-
- id: BoxSpeedLoaderLightRifle
10-
amount: 1
9+
- id: MagazineLightRifleMarkOne
10+
amount: 4
1111

1212
- type: entity
1313
id: CrateArmoryUniversal

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@
248248
- RiotShield
249249
- SpeedLoaderMagnum
250250
- SpeedLoaderMagnumEmpty
251+
- MagazineLightRifleMarkOneEmpty
252+
- MagazineLightRifleMarkOne
251253
- GrenadeFlashBang # Goobstation
252254
# .35 Caseless Pistol
253255
- MagazinePistolCaselessRiflePractice # EE
@@ -1032,6 +1034,8 @@
10321034
- MagazineUniversalMagnumEmpty
10331035
- MagazineUniversalMagnum
10341036
- MagazineUniversalMagnumRubber
1037+
- MagazineLightRifleMarkOneEmpty
1038+
- MagazineLightRifleMarkOne
10351039
dynamicRecipes:
10361040
- Truncheon
10371041
- Terminus
@@ -1237,6 +1241,8 @@
12371241
- MagazineBoxCaselessRiflePractice # EE
12381242
- MagazineBoxCaselessRifle # EE
12391243
- MagazineBoxCaselessRifleRubber # EE
1244+
- MagazineLightRifleMarkOneEmpty
1245+
- MagazineLightRifleMarkOne
12401246
- type: MaterialStorage
12411247
whitelist:
12421248
tags:
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
- type: entity
2+
id: MagazineLightRifleMarkOneEmpty
3+
name: "mark 1 rifle en-bloc (.30 rifle any)"
4+
suffix: empty
5+
parent: MagazineLightRifle
6+
components:
7+
- type: Tag
8+
tags:
9+
- MagazineMarkOne
10+
- type: BallisticAmmoProvider
11+
proto: null
12+
capacity: 8
13+
- type: Item
14+
size: Tiny
15+
- type: Sprite
16+
sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
17+
layers:
18+
- state: base
19+
map: ["enum.GunVisualLayers.Base"]
20+
- state: mag-1
21+
map: ["enum.GunVisualLayers.Mag"]
22+
- type: MagazineVisuals
23+
magState: mag
24+
steps: 6
25+
zeroVisible: false
26+
27+
- type: entity
28+
id: MagazineLightRifleMarkOne
29+
name: "mark 1 rifle en-bloc (.30 rifle)"
30+
parent: BaseMagazineLightRifle
31+
components:
32+
- type: Tag
33+
tags:
34+
- MagazineMarkOne
35+
- type: BallisticAmmoProvider
36+
proto: CartridgeLightRifle
37+
capacity: 8
38+
- type: Item
39+
size: Tiny
40+
- type: Sprite
41+
sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
42+
layers:
43+
- state: base
44+
map: ["enum.GunVisualLayers.Base"]
45+
- state: mag-1
46+
map: ["enum.GunVisualLayers.Mag"]
47+
- type: MagazineVisuals
48+
magState: mag
49+
steps: 6
50+
zeroVisible: false
Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
- type: entity
22
name: mark 1 rifle
3-
parent: BaseWeaponSniper
3+
parent: BaseWeaponRifle
44
id: WeaponSniperGrand
55
description: A heavy and reliable self-loading rifle, utilising a modified version of a centuries-old design. Uses .30 rifle ammo.
66
components:
77
- type: Sprite
88
sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
9+
layers:
10+
- state: base
11+
map: ["enum.GunVisualLayers.Base"]
912
- type: Clothing
1013
sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
1114
- type: Gun
@@ -15,22 +18,38 @@
1518
- SemiAuto
1619
soundGunshot:
1720
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
18-
- type: BallisticAmmoProvider
19-
# autoCycle: true
20-
capacity: 5
21-
proto: CartridgeLightRifle
22-
whitelist:
23-
tags:
24-
- CartridgeLightRifle
21+
- type: ItemSlots
22+
slots:
23+
gun_magazine:
24+
name: Magazine
25+
startingItem: MagazineLightRifleMarkOne
26+
priority: 2
27+
whitelist:
28+
tags:
29+
- MagazineMarkOne
30+
gun_chamber:
31+
name: Chamber
32+
startingItem: CartridgeLightRifle
33+
priority: 1
34+
whitelist:
35+
tags:
36+
- CartridgeLightRifle
37+
- type: ChamberMagazineAmmoProvider
38+
autoEject: true
39+
soundAutoEject:
40+
path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg
2541

2642
- type: entity
2743
name: ceremonial rifle
28-
parent: BaseWeaponSniper
44+
parent: BaseWeaponRifle
2945
id: WeaponSniperCeremonial
3046
description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo.
3147
components:
3248
- type: Sprite
3349
sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi
50+
layers:
51+
- state: base
52+
map: ["enum.GunVisualLayers.Base"]
3453
- type: Clothing
3554
sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi
3655
- type: Gun
@@ -40,10 +59,23 @@
4059
- SemiAuto
4160
soundGunshot:
4261
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
43-
- type: BallisticAmmoProvider
44-
# autoCycle: true
45-
capacity: 5
46-
proto: CartridgeLightRifle
47-
whitelist:
48-
tags:
49-
- CartridgeLightRifle
62+
- type: ItemSlots
63+
slots:
64+
gun_magazine:
65+
name: Magazine
66+
startingItem: MagazineLightRifleMarkOne
67+
priority: 2
68+
whitelist:
69+
tags:
70+
- MagazineMarkOne
71+
gun_chamber:
72+
name: Chamber
73+
startingItem: CartridgeLightRifle
74+
priority: 1
75+
whitelist:
76+
tags:
77+
- CartridgeLightRifle
78+
- type: ChamberMagazineAmmoProvider
79+
autoEject: true
80+
soundAutoEject:
81+
path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg

Resources/Prototypes/Recipes/Lathes/security.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,3 +1446,19 @@
14461446
Plasteel: 100
14471447
Plastic: 450
14481448
Silver: 100
1449+
1450+
- type: latheRecipe
1451+
id: MagazineLightRifleMarkOneEmpty
1452+
result: MagazineLightRifleMarkOneEmpty
1453+
category: Ammo
1454+
completetime: 2
1455+
materials:
1456+
Steel: 100
1457+
1458+
- type: latheRecipe
1459+
id: MagazineLightRifleMarkOne
1460+
result: MagazineLightRifleMarkOne
1461+
category: Ammo
1462+
completetime: 2
1463+
materials:
1464+
Steel: 200

Resources/Prototypes/tags.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,5 +1529,8 @@
15291529
- type: Tag
15301530
id: SiliconEmotes
15311531

1532+
- type: Tag
1533+
id: MagazineMarkOne
1534+
15321535
- type: Tag
15331536
id: UnathiEmotes

0 commit comments

Comments
 (0)