Skip to content

Commit 3fd5287

Browse files
TadJohnson00Adeinitas
and
Adeinitas
authored
Change military boot whitelist tag (#1794)
Co-authored-by: Adeinitas <[email protected]>
1 parent 1c11e36 commit 3fd5287

File tree

9 files changed

+16
-1
lines changed

9 files changed

+16
-1
lines changed

Diff for: Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

+2
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
tags:
112112
- HighRiskItem
113113
- Sidearm
114+
- ConcealCarry # DeltaV - can be stowed in military boots for now
114115
- type: StaticPrice
115116
price: 750
116117
- type: StealTarget
@@ -220,6 +221,7 @@
220221
- type: Tag
221222
tags:
222223
- Sidearm
224+
- ConcealCarry # DeltaV - can be stowed in military boots for now
223225
- type: StaticPrice
224226
price: 750
225227

Diff for: Resources/Prototypes/DeltaV/tags.yml

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
- type: Tag
4343
id: CartridgeMusket #For the Craftable Musket
4444

45+
- type: Tag
46+
id: ConcealCarry # For objects that can be stored in military-style boots or similar items
47+
4548
- type: Tag
4649
id: Directional
4750

Diff for: Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
whitelist:
5151
tags:
5252
- Knife
53-
- Sidearm
53+
- ConcealCarry # DeltaV - replace Sidearm tag
5454

5555
- type: entity
5656
abstract: true

Diff for: Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
tags:
125125
- Sidearm
126126
- BrassInstrument
127+
- ConcealCarry # DeltaV - can be stowed in military boots for now
127128

128129
- type: entity
129130
parent: BaseHandheldInstrument

Diff for: Resources/Prototypes/Entities/Objects/Fun/toys.yml

+1
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@
987987
tags:
988988
- Sidearm
989989
- ToySidearm
990+
- ConcealCarry # DeltaV - can be stowed in military boots for now
990991
- type: Gun
991992
selectedMode: SemiAuto
992993
availableModes:

Diff for: Resources/Prototypes/Entities/Objects/Tools/appraisal.yml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
tags:
2525
- AppraisalTool
2626
- Sidearm
27+
- ConcealCarry # DeltaV - can be stowed in military boots for now
2728
- type: GuideHelp
2829
guides:
2930
- Cargo

Diff for: Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
- type: Tag
8080
tags:
8181
- Sidearm
82+
- ConcealCarry # DeltaV - can be stowed in military boots for now
8283
- type: Clothing
8384
sprite: Objects/Weapons/Guns/Battery/taser.rsi
8485
quickEquip: false
@@ -96,6 +97,7 @@
9697
- type: Tag
9798
tags:
9899
- Sidearm
100+
- ConcealCarry # DeltaV - can be stowed in military boots for now
99101
- type: Clothing
100102
sprite: Objects/Weapons/Guns/Battery/taser.rsi
101103
quickEquip: false
@@ -443,6 +445,7 @@
443445
tags:
444446
- Taser
445447
- Sidearm
448+
- ConcealCarry # DeltaV - can be stowed in military boots for now
446449

447450
- type: entity
448451
name: disabler
@@ -519,6 +522,7 @@
519522
tags:
520523
- Taser
521524
- Sidearm
525+
- ConcealCarry # DeltaV - can be stowed in military boots for now
522526
- type: Sprite
523527
sprite: Objects/Weapons/Guns/Battery/taser.rsi
524528
layers:
@@ -580,6 +584,7 @@
580584
- HighRiskItem
581585
- Sidearm
582586
- WeaponAntiqueLaser
587+
- ConcealCarry # DeltaV - can be stowed in military boots for now
583588
- type: StaticPrice
584589
price: 750
585590
- type: StealTarget

Diff for: Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- type: Tag
2020
tags:
2121
- Sidearm
22+
- ConcealCarry # Deltav - allow all pistols to be stowed in military boots for now.
2223
- type: Clothing
2324
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
2425
quickEquip: false

Diff for: Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- type: Tag
1616
tags:
1717
- Sidearm
18+
- ConcealCarry # DeltaV - allow revolvers to be stowed in military boots for now
1819
- type: Clothing
1920
sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
2021
quickEquip: false

0 commit comments

Comments
 (0)