Skip to content

Commit 51e231e

Browse files
authored
Merge pull request #82655 from John-Candlebury/afs-de-variant
Aftershock: Clear variants in several copy-from items
2 parents 7f1ab1c + e0369c7 commit 51e231e

File tree

6 files changed

+19
-0
lines changed

6 files changed

+19
-0
lines changed

data/mods/aftershock_exoplanet/items/armor/civilian_blue_collar.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"copy-from": "vest",
9494
"looks_like": "vest",
9595
"name": { "str": "hi-vis vest" },
96+
"variants": [ ],
9697
"description": "A bright orange winter vest with several front facing pockets. Not even close to warm enough.",
9798
"material": [ "cotton", "plastic" ],
9899
"warmth": 70,
@@ -106,6 +107,7 @@
106107
"copy-from": "jacket_windbreaker",
107108
"looks_like": "jacket_windbreaker",
108109
"name": { "str": "company jacket" },
110+
"variants": [ ],
109111
"description": "A synthetic jacket adorned with the logos and colors of some interstellar corporation. Impermeable, but not very warm.",
110112
"color": "blue"
111113
},
@@ -116,6 +118,7 @@
116118
"copy-from": "jacket_windbreaker",
117119
"looks_like": "jacket_windbreaker",
118120
"name": { "str": "supervisor jacket" },
121+
"variants": [ ],
119122
"description": "A variant company jacket tailored to slightly recall a business suit, often issued to low level managers. Some might think it looks nicer, but it's just as cheaply made.",
120123
"color": "blue"
121124
},
@@ -126,6 +129,7 @@
126129
"copy-from": "tie_skinny",
127130
"looks_like": "tie_skinny",
128131
"name": { "str": "worker's tie" },
132+
"variants": [ ],
129133
"description": "Calling this thin strip of dark fabric a tie would do it a favor."
130134
},
131135
{
@@ -136,6 +140,7 @@
136140
"looks_like": "jumpsuit",
137141
"name": { "str": "crew jumpsuit" },
138142
"description": "A lightweight cloth jumpsuit adorned with the faded corporate regalia of some freight hauling association or another. This one is a standard design favored by spacers, with ample, easy access pockets.",
143+
"variants": [ ],
139144
"color": "brown"
140145
},
141146
{
@@ -192,6 +197,7 @@
192197
"copy-from": "hat_cotton",
193198
"material": [ "plastic", "cotton" ],
194199
"looks_like": "powered_earmuffs",
200+
"variants": [ ],
195201
"flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "PARTIAL_DEAF" ],
196202
"name": { "str": "communications cap" },
197203
"description": "A padded cotton cap built around an augmented reality headset. During normal operation it would provide visual information about a ship subsystems and a communications link with the rest of the crew, but severed from a spaceship, only their hearing protection function retains any utility.",

data/mods/aftershock_exoplanet/items/armor/exosuit/exosuit_underlayers.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"environmental_protection": 5,
1515
"charges_per_use": 1,
1616
"tool_ammo": "battery",
17+
"variants": [ ],
1718
"use_action": {
1819
"type": "transform",
1920
"msg": "You activate your %s.",
@@ -92,6 +93,7 @@
9293
"charges_per_use": 1,
9394
"tool_ammo": "battery",
9495
"environmental_protection": 5,
96+
"variants": [ ],
9597
"use_action": {
9698
"type": "transform",
9799
"msg": "You activate your %s.",
@@ -170,6 +172,7 @@
170172
"charges_per_use": 1,
171173
"tool_ammo": "battery",
172174
"environmental_protection": 100,
175+
"variants": [ ],
173176
"use_action": {
174177
"type": "transform",
175178
"msg": "You activate your %s.",
@@ -250,6 +253,7 @@
250253
"charges_per_use": 1,
251254
"tool_ammo": "battery",
252255
"environmental_protection": 16,
256+
"variants": [ ],
253257
"use_action": {
254258
"type": "transform",
255259
"msg": "You activate your %s.",

data/mods/aftershock_exoplanet/items/armor/military_clothing.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"name": { "str_sp": "military overalls" },
99
"description": "A sturdy Nomex jumpsuit, normally worn by armed forces during transit or beneath combat armor while in the field.",
1010
"material": [ { "type": "nylon", "portion": 7 }, { "type": "nomex", "portion": 3 } ],
11+
"variants": [ ],
1112
"material_thickness": 0.4,
1213
"color": "light_gray"
1314
},
@@ -29,6 +30,7 @@
2930
"volume_encumber_modifier": 0.25
3031
}
3132
],
33+
"variants": [ ],
3234
"pocket_data": [
3335
{
3436
"description": "Rifle attachment point.",

data/mods/aftershock_exoplanet/items/gun/40mm_grenade.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"clip_size": 3,
1313
"reload": 200,
1414
"extend": { "flags": [ "RELOAD_ONE" ] },
15+
"variants": [ ],
1516
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 3 } } ],
1617
"melee_damage": { "bash": 6 }
1718
}

data/mods/aftershock_exoplanet/items/gun/7.50mm.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"min_strength": 16,
2222
"clip_size": 9,
2323
"flags": [ "WATERPROOF_GUN", "RELOAD_ONE", "NEVER_JAMS" ],
24+
"variants": [ ],
2425
"valid_mod_locations": [
2526
[ "barrel", 1 ],
2627
[ "brass catcher", 1 ],
@@ -60,6 +61,7 @@
6061
"durability": 5,
6162
"blackpowder_tolerance": 60,
6263
"ammo": [ "afs_7.50mm" ],
64+
"variants": [ ],
6365
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_7.50mm": 1 } } ],
6466
"faults": [ { "fault": "fault_gun_blackpowder" }, { "fault": "fault_gun_dirt" } ]
6567
},
@@ -86,6 +88,7 @@
8688
"reload": 400,
8789
"modes": [ [ "DEFAULT", "burst", 4 ] ],
8890
"built_in_mods": [ "bipod" ],
91+
"variants": [ ],
8992
"valid_mod_locations": [
9093
[ "barrel", 1 ],
9194
[ "brass catcher", 1 ],
@@ -132,6 +135,7 @@
132135
"dispersion": 150,
133136
"durability": 10,
134137
"min_cycle_recoil": 1350,
138+
"variants": [ ],
135139
"pocket_data": [
136140
{
137141
"pocket_type": "MAGAZINE_WELL",
@@ -245,6 +249,7 @@
245249
"blackpowder_tolerance": 0,
246250
"min_cycle_recoil": 0,
247251
"handling": 25,
252+
"variants": [ ],
248253
"pocket_data": [
249254
{
250255
"pocket_type": "MAGAZINE_WELL",

data/mods/aftershock_exoplanet/items/gun/shot.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
[ "sights", 1 ],
5555
[ "underbarrel mount", 1 ]
5656
],
57+
"variants": [ ],
5758
"price": "4 kUSD",
5859
"price_postapoc": "4 kUSD",
5960
"built_in_mods": [ "afs_magnetic_choke", "afs_shotgun_gauss" ]

0 commit comments

Comments
 (0)