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
@@ -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"/>