From cafd428ccfe6ff71c562fc580e2abcad59cd3416 Mon Sep 17 00:00:00 2001 From: Alex Evgrashin Date: Sun, 13 Mar 2022 01:09:10 +0300 Subject: [PATCH] Fix guitar and other items swaping (#7091) --- .../Prototypes/Entities/Clothing/Neck/base_clothingneck.yml | 2 +- Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/instruments.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml | 2 +- .../Entities/Objects/Specific/Hydroponics/tools.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml | 2 +- .../Entities/Objects/Weapons/Throwable/grenades.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Weapons/security.yml | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index d2b57c0d32..597cf162b8 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -5,7 +5,7 @@ components: - type: Clothing size: 10 - QuickEquip: true + quickEquip: true Slots: - neck - type: Sprite diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml index 4f17188b20..64fdc843c3 100644 --- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml +++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml @@ -13,7 +13,7 @@ state: icon - type: Clothing sprite: Objects/Tools/debug.rsi - QuickEquip: false + quickEquip: false Slots: - Belt - type: MeleeWeapon diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6106736f7e..1908ccb311 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -623,7 +623,7 @@ state: mouse-0 sprite: Mobs/Animals/mouse.rsi - type: Clothing - QuickEquip: false + quickEquip: false sprite: Mobs/Animals/mouse.rsi HeldPrefix: 0 Slots: diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 8d1af88b59..178fea5f52 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -16,7 +16,7 @@ sprite: Objects/Devices/pda.rsi state: pda - type: Clothing - QuickEquip: false + quickEquip: false size: 10 Slots: - idcard diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index f0e8fbd2ba..18ba3aedd8 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -11,7 +11,7 @@ sprite: Objects/Fun/bikehorn.rsi size: 5 Slots: [Belt] - QuickEquip: false + quickEquip: false - type: ItemCooldown - type: EmitSoundOnUse sound: diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index 792c22273c..c1f45ab5f1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -52,7 +52,7 @@ - StringInstrument - type: Clothing size: 24 - QuickEquip: false + quickEquip: false Slots: - back sprite: Objects/Fun/Instruments/guitar.rsi @@ -273,7 +273,7 @@ size: 24 sprite: Objects/Fun/Instruments/bike_horn.rsi Slots: [Belt] - QuickEquip: false + quickEquip: false - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index e268518bfa..8d97757085 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -188,7 +188,7 @@ sprite: Objects/Fun/ducky.rsi state: icon - type: Clothing - QuickEquip: false + quickEquip: false sprite: Objects/Fun/ducky.rsi Slots: - HEAD diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 9bf72d5057..a006babfb1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -14,7 +14,7 @@ netsync: false - type: Clothing size: 10 - QuickEquip: true + quickEquip: true Slots: - neck diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 2105cea2f7..5041eb7fc0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -118,7 +118,7 @@ state: icon - type: Clothing sprite: Objects/Specific/Hydroponics/Equipment/plant_bag.rsi - QuickEquip: false + quickEquip: false Slots: - belt size: 200 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 53722ef961..d0a8474342 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -15,7 +15,7 @@ - type: Clothing size: 15 sprite: Objects/Tanks/generic.rsi - QuickEquip: false + quickEquip: false - type: GasTank toggleAction: name: action-name-internals-toggle diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 927c0fdbcd..bc79cfc748 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -14,7 +14,7 @@ - type: Clothing sprite: Objects/Tools/jaws_of_life.rsi size: 50 - QuickEquip: false + quickEquip: false Slots: - Belt - type: TilePrying diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d71429e05a..3832af41d0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -174,7 +174,7 @@ - type: Clothing size: 5 sprite: Objects/Tools/multitool.rsi - QuickEquip: false + quickEquip: false Slots: - Belt - type: Tool @@ -239,7 +239,7 @@ - type: Clothing size: 20 sprite: Objects/Tools/rcd.rsi - QuickEquip: false + quickEquip: false Slots: - Belt diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 3e8a8fed69..f5d855f704 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -207,7 +207,7 @@ - type: Clothing sprite: Objects/Weapons/Guns/Battery/taser.rsi size: 24 - QuickEquip: false + quickEquip: false Slots: - Belt HeldPrefix: taser4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 1c6781de28..2dff1630e9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -26,9 +26,9 @@ - type: Clothing size: 20 sprite: Objects/Weapons/Melee/fireaxe.rsi - QuickEquip: false + quickEquip: false Slots: - back - type: Tool qualities: - - Prying \ No newline at end of file + - Prying diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index b595555a04..af21647416 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -25,7 +25,7 @@ - type: Clothing size: 40 sprite: Objects/Weapons/Melee/spear.rsi - QuickEquip: false + quickEquip: false Slots: - back - type: Construction diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index eaf25ef0d3..6446769fd4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -12,7 +12,7 @@ - type: Clothing sprite: Objects/Weapons/Grenades/grenade.rsi size: 5 - QuickEquip: false + quickEquip: false Slots: - Belt - type: OnUseTimerTrigger @@ -51,7 +51,7 @@ - type: Clothing sprite: Objects/Weapons/Grenades/flashbang.rsi size: 5 - QuickEquip: false + quickEquip: false Slots: - Belt - type: OnUseTimerTrigger diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 346c5251bf..40c45b4e1c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -23,7 +23,7 @@ - type: Clothing sprite: Objects/Weapons/Melee/stunbaton.rsi HeldPrefix: off - QuickEquip: false + quickEquip: false size: 20 Slots: - Belt