Merge branch 'master' into coolthings

2017-12-17 21:11:42 +02:00
parent 041d1112b8 a5d6da31a4
commit 62bb5119ab
13 changed files with 102 additions and 34 deletions
@@ -235,8 +235,7 @@
  <Item
    name="Flashlight"
    category="Equipment"
-    Tags="smallitem"
-    
+    Tags="smallitem"    
    price="10">

    <Deconstruct time="15">
@@ -248,12 +247,11 @@

    <Body width="27" height="10" density="15"/>

-    <Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" aimpos="100,0" handle1="0,0">
+    <Holdable slots="Any,RightHand,LeftHand,Face" holdpos="30,-15" aimpos="100,0" handle1="-13" handle2="-13">
      <StatusEffect type="OnActive" target="Contained" Condition="-0.2"/>
    </Holdable>

    <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.1" range="800" powerconsumption="10" IsOn="true">
-
      <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="2.0,1.0"/>
    </LightComponent>