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
@@ -61,7 +61,7 @@
    <joint limb1="0" limb1anchor="64,-264" limb2="2" limb2anchor="0,-100" lowerlimit="180" upperlimit="210" canbesevered="true"/>

    <joint limb1="0" limb1anchor="-100,100" limb2="3" limb2anchor="38,0" lowerlimit="-50" upperlimit="5" canbesevered="true"/>
-    <joint limb1="0" limb1anchor="140,268" limb2="4" limb2anchor="0,0" lowerlimit="87" upperlimit="93"/>
+    <joint limb1="0" limb1anchor="140,268" limb2="4" limb2anchor="0,0" lowerlimit="87" upperlimit="93" canbesevered="false"/>

  </ragdoll>

@@ -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>
    
@@ -36,11 +36,12 @@
    category="Machine"
    type="Controller"
    linkable="true"
+    disableitemusagewhenselected="true"
    >

    <Sprite texture ="railgunetc.png" depth="0.8" sourcerect="182,0,61,97"/>
    
-    <Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected = "true">
+    <Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected="true">
      <limbposition limb="Head" position="-5,-62"/>
      <limbposition limb="Torso" position="-5,-108"/>
      <limbposition limb="LeftHand" position="43,-85"/>