Merge branch 'temp_merchant_fix' into 'master'

Temporary invincible merchants

See merge request veloren/veloren!3541
This commit is contained in:
Monty Marz 2022-08-16 12:16:45 +00:00
commit 5e5665ea19

View File

@ -11,4 +11,5 @@
legs: Item("common.items.armor.merchant.pants"),
feet: Item("common.items.armor.merchant.foot"),
lantern: Item("common.items.lantern.black_0"),
tabard: Item("common.items.debug.admin"),
)