Spectating, fire, damaged limb sprites, water detector, engineer jumpsuit, new signal comp sprites, resharper cleanup (god knows what else, commit more often)

This commit is contained in:
Regalis
2015-11-10 22:22:26 +02:00
parent cd48d12be6
commit 4d949e3be1
89 changed files with 977 additions and 622 deletions
+28 -5
View File
@@ -4,7 +4,7 @@
pickdistance="150"
tags="smallitem">
<Sprite texture ="captainhat.png" depth="0.4"/>
<Sprite texture ="captainhat.png" depth="0.6"/>
<Body radius="8" density="5"/>
@@ -18,7 +18,7 @@
pickdistance="150"
tags="smallitem">
<Sprite texture ="captainLegs.png" sourcerect="0,49,52,17" depth="0.4"/>
<Sprite texture ="captainLegs.png" sourcerect="0,49,52,17" depth="0.6"/>
<Body width="52" height="17"/>
@@ -38,7 +38,7 @@
pickdistance="150"
tags="smallitem">
<Sprite texture ="captainLegs.png" sourcerect="0,67,51,13" depth="0.4"/>
<Sprite texture ="captainLegs.png" sourcerect="0,67,51,13" depth="0.6"/>
<Body width="51" height="13"/>
@@ -57,7 +57,7 @@
pickdistance="150"
tags="smallitem">
<Sprite texture ="securitygear.png" sourcerect="68,0,60,31" depth="0.4"/>
<Sprite texture ="securitygear.png" sourcerect="68,0,60,31" depth="0.6"/>
<Body width="52" height="17"/>
@@ -73,7 +73,7 @@
pickdistance="150"
tags="smallitem">
<Sprite texture ="securitygear.png" sourcerect="40,32,34,25" depth="0.4"/>
<Sprite texture ="securitygear.png" sourcerect="40,32,34,25" depth="0.6"/>
<Body radius="12"/>
@@ -82,5 +82,28 @@
</Wearable>
</Item>
<Item
name="Orange Jumpsuit"
pickdistance="150"
tags="smallitem">
<Sprite texture = "engigear.png" sourcerect="0,52,50,26" depth="0.6"/>
<Body width="50" height="17"/>
<Wearable slots="Any,Torso,Legs">
<sprite texture="engigear.png" limb="Torso" sourcerect="0,0,32,51" origin="0.5,0.48" depth="0.01"/>
<sprite texture="engigear.png" limb="Waist" sourcerect="81,0,30,26" origin="0.5,0.45" hidelimb="true"/>
<sprite texture="engigear.png" limb="RightThigh" sourcerect="53,0,27,49" origin="0.5,0.5" depth="0.10" hidelimb="true"/>
<sprite texture="engigear.png" limb="LeftThigh" sourcerect="53,0,27,49" origin="0.5,0.5" depth="0.14" hidelimb="true"/>
<sprite texture="engigear.png" limb="RightLeg" sourcerect="33,0,20,51" origin="0.5,0.5" depth="0.11" hidelimb="true"/>
<sprite texture="engigear.png" limb="LeftLeg" sourcerect="33,0,20,51" origin="0.5,0.5" depth="0.15" hidelimb="true"/>
</Wearable>
<ItemContainer containableitems="smallitem" capacity="5"/>
</Item>
</Items>
Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

@@ -102,7 +102,7 @@
linkable="true"
price="10">
<Sprite texture ="or.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="16,0,16,16"/>
<OrComponent canbeselected = "true"/>
@@ -129,7 +129,7 @@
linkable="true"
price="10">
<Sprite texture ="not.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="32,0,16,16"/>
<NotComponent canbeselected = "true"/>
@@ -155,7 +155,7 @@
linkable="true"
price="10">
<Sprite texture ="light.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="48,0,16,16"/>
<LightComponent canbeselected = "true" color="1.0,0.0,0.0,1.0">
<sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
@@ -182,11 +182,11 @@
linkable="true"
price="10">
<Sprite texture ="light.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="96,0,31,24"/>
<OxygenDetector canbeselected = "true"/>
<Body width="16" height="16"/>
<Body width="31" height="24"/>
<Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]"
aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
@@ -199,6 +199,30 @@
</ConnectionPanel>
</Item>
<Item
name="Water Detector"
Tags="smallitem"
pickdistance="150"
linkable="true"
price="10">
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="64,0,31,25"/>
<WaterDetector canbeselected = "true"/>
<Body width="31" height="24"/>
<Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]"
aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
<requireditem name="Wrench" type="Equipped"/>
</Holdable>
<ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
<requireditem name="Screwdriver,Wire" type="Equipped"/>
<output name="signal_out"/>
</ConnectionPanel>
</Item>
<Item
name="Signal Check Component"
Tags="smallitem"
@@ -206,7 +230,7 @@
linkable="true"
price="10">
<Sprite texture ="light.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="0,16,16,16"/>
<SignalCheckComponent canbeselected = "true"/>
@@ -233,7 +257,7 @@
linkable="true"
price="10">
<Sprite texture ="regex.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="16,16,16,16"/>
<RegExFindComponent canbeselected = "true"/>
@@ -258,7 +282,7 @@
linkable="true"
price="20">
<Sprite texture ="wifi.png" depth="0.8"/>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="0,13,16,19"/>
<WifiComponent canbeselected = "true"/>