diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index 4c5216f8c..3aa8874fd 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -181,6 +181,7 @@ 0 0 0 + 0 0 0 @@ -48961,7 +48962,7 @@ 1636 Flashlight Flashlight - I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the hea. + I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the head with. Flashlight We say: let there be light! Batteries included. 128 @@ -49089,4 +49090,37 @@ + + 1640 + Tripwire Roll + Tripwire Roll + TRipwire can be deployed directly frm this roll. + Tripwire Roll + A roll of tripwire. In case you need to boobytrap your house, your car, and your cat. + 512 + 1 + 86 + 18 + 2 + 66 + 3 + 26 + 200 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 100.0 + 17 + 16777216 + 1524 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml index 2239b1c0d..360da2de3 100644 --- a/gamedir/Data-1.13/TableData/Items/Merges.xml +++ b/gamedir/Data-1.13/TableData/Items/Merges.xml @@ -5744,6 +5744,22 @@ 9 32 + + 1524 + 1640 + 1640 + 0 + 12 + 20 + + + 1524 + 1524 + 1640 + 0 + 4 + 20 + 1546 1546 @@ -5784,4 +5800,12 @@ 4 32 + + 1632 + 1632 + 1632 + 0 + 1 + 32 + \ No newline at end of file