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.

Sign up for GitHub

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

Jump to bottom

Change military boot whitelist tag #1794

Merged
2 commits merged into from
Sep 21, 2024
Merged

Change military boot whitelist tag #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ae215e
Change military boot whitelist tag
TadJohnson00 Sep 11, 2024
8c3e4b8
Merge branch 'master' into ConcealCarryTag
Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
tags:
- HighRiskItem
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: StaticPrice
price: 750
- type: StealTarget
Expand Down Expand Up @@ -220,6 +221,7 @@
- type: Tag
tags:
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: StaticPrice
price: 750

Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
- type: Tag
id: CartridgeMusket #For the Craftable Musket

- type: Tag
id: ConcealCarry # For objects that can be stored in military-style boots or similar items

- type: Tag
id: Directional

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
whitelist:
tags:
- Knife
- Sidearm
- ConcealCarry # DeltaV - replace Sidearm tag

- type: entity
abstract: true
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
tags:
- Sidearm
- BrassInstrument
- ConcealCarry # DeltaV - can be stowed in military boots for now

- type: entity
parent: BaseHandheldInstrument
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,7 @@
tags:
- Sidearm
- ToySidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: Gun
selectedMode: SemiAuto
availableModes:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
tags:
- AppraisalTool
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: GuideHelp
guides:
- Cargo
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
- type: Tag
tags:
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/taser.rsi
quickEquip: false
Expand All @@ -96,6 +97,7 @@
- type: Tag
tags:
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/taser.rsi
quickEquip: false
Expand Down Expand Up @@ -443,6 +445,7 @@
tags:
- Taser
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now

- type: entity
name: disabler
Expand Down Expand Up @@ -519,6 +522,7 @@
tags:
- Taser
- Sidearm
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/taser.rsi
layers:
Expand Down Expand Up @@ -580,6 +584,7 @@
- HighRiskItem
- Sidearm
- WeaponAntiqueLaser
- ConcealCarry # DeltaV - can be stowed in military boots for now
- type: StaticPrice
price: 750
- type: StealTarget
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- type: Tag
tags:
- Sidearm
- ConcealCarry # Deltav - allow all pistols to be stowed in military boots for now.
- type: Clothing
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
quickEquip: false
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- type: Tag
tags:
- Sidearm
- ConcealCarry # DeltaV - allow revolvers to be stowed in military boots for now
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
quickEquip: false
Expand Down
Loading