Merge branch 'master' into patch-2

2018-07-18 00:25:54 +02:00
parent 47e64b9c18 660f75bb10
commit b34a98d760
23 changed files with 355 additions and 198 deletions
@@ -17,9 +17,11 @@

    <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
      <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
+        <Conditional Condition="gt 25"/>
        <sound file="Content/Items/Reactor/explosion.ogg"/>
        <Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
      </StatusEffect>
+      <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true"/>
    </Pickable>
  </Item>

@@ -13,6 +13,7 @@
    </fixrequirement>

    <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected = "true">
+
      <StatusEffect type="OnFire" target="This" Condition="-0.5"/>
      <StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="2.0"/>
      <StatusEffect type="OnActive" target="Contained" targetnames="Oxygenite Tank" Condition="0.0"/>