summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-03-05 02:06:58 -0300
committerJesusaves <cpntb1@ymail.com>2019-03-05 02:06:58 -0300
commit7c4bf702db82e645c55e8cecb8656f4087958502 (patch)
tree2270dc04e022503c92ae8586e3406ff18015a08d
parent1fc4f3f911465de4b2e90e8656ed1b87690e7582 (diff)
parent331fcb8e36f5fb790f93dbd4214620e86f0122c0 (diff)
downloadclientdata-7c4bf702db82e645c55e8cecb8656f4087958502.tar.gz
clientdata-7c4bf702db82e645c55e8cecb8656f4087958502.tar.bz2
clientdata-7c4bf702db82e645c55e8cecb8656f4087958502.tar.xz
clientdata-7c4bf702db82e645c55e8cecb8656f4087958502.zip
Merge branch 'master' into jesusalva/estate
-rw-r--r--LICENSE1
-rw-r--r--graphics/sprites/equipment/chest/minertanktop-female.pngbin0 -> 21236 bytes
-rw-r--r--graphics/sprites/equipment/chest/minertanktop-female.xml11
-rw-r--r--items.xml12
4 files changed, 24 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 720f8c7c..9aa0dc12 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1110,6 +1110,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/chest/leathershirt-male.png (Modanung) (CC BY-SA 3.0) (Saulc)
graphics/sprites/equipment/chest/lightplatemail-female.png (Crush) (CC BY-SA 3.0) (Saulc)
graphics/sprites/equipment/chest/lightplatemail-male.png (Crush) (CC BY-SA 3.0) (Saulc)
+ graphics/sprites/equipment/chest/minertanktop-female.png (Saulc) (CC BY-SA 3.0) (Modanung)
graphics/sprites/equipment/chest/minertanktop-male.png (Saulc) (CC BY-SA 3.0) (Modanung)
graphics/sprites/equipment/chest/redknightarmor-female.png (?) (GPLv2) (Saulc, TMW-Br)
graphics/sprites/equipment/chest/redknightarmor-male.png (?) (GPLv2) (Saulc, TMW-Br)
diff --git a/graphics/sprites/equipment/chest/minertanktop-female.png b/graphics/sprites/equipment/chest/minertanktop-female.png
new file mode 100644
index 00000000..da4ccff1
--- /dev/null
+++ b/graphics/sprites/equipment/chest/minertanktop-female.png
Binary files differ
diff --git a/graphics/sprites/equipment/chest/minertanktop-female.xml b/graphics/sprites/equipment/chest/minertanktop-female.xml
new file mode 100644
index 00000000..3a6c5c93
--- /dev/null
+++ b/graphics/sprites/equipment/chest/minertanktop-female.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2019 TMW2: Moubootaur Legends -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/chest/minertanktop-female.png"
+ width="64"
+ height="64"/>
+
+ <include file="races/human-male.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index 1bd96f6b..48909b0a 100644
--- a/items.xml
+++ b/items.xml
@@ -3339,6 +3339,18 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sprite gender="unisex">equipment/chest/silkrobe-male.xml|#000000</sprite>
<sprite gender="female">equipment/chest/silkrobe-female.xml|#000000</sprite>
</item>
+ <item id="1338"
+ image="equipment/chest/minertanktop.png"
+ name="Miner Tank Top"
+ description="A shirt with reflective stripes... totally makes you 'safer'."
+ luck="1"
+ defense="46"
+ level="29"
+ type="equip-torso"
+ weight="110">
+ <sprite gender="unisex">equipment/chest/minertanktop-male.xml</sprite>
+ <sprite gender="female">equipment/chest/minertanktop-female.xml</sprite>
+ </item>
<!-- Boots -->
<item id="1800"