Merge branch 'master' into develop

This commit is contained in:
Griatch 2019-02-24 12:30:55 +01:00
commit a7013e3a82

View file

@ -420,10 +420,6 @@ north
(to get a weapon from the barrel, use |wget weapon|n)
#
@desc barrel =
This barrel has the air of leftovers - it contains an assorted
mess of random weaponry in various states and qualities.
#
@detail barkeep;man;landlord =
The landlord is a cheerful fellow, always ready to supply you with
more beer. He mentions doing some sort of arcane magic known as
@ -439,6 +435,10 @@ north
#
@create/drop barrel: tutorial_world.objects.WeaponRack
#
@desc barrel =
This barrel has the air of leftovers - it contains an assorted
mess of random weaponry in various states and qualities.
#
@lock barrel = get:false()
#
# Players trying to pickup barrel will receive hint to 'get weapon' instead