diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems index 4dfec9011..a0464c1ec 100644 --- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems +++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems @@ -232,6 +232,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml index 2a0482ae3..4d1cfece4 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml @@ -11,7 +11,7 @@ - diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml index be56bd24e..11f441901 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml @@ -35,8 +35,7 @@ category="Machine" type="Controller" linkable="true" - disableitemusagewhenselected="true" - > + disableitemusagewhenselected="true"> @@ -55,13 +54,12 @@ - + disableitemusagewhenselected="true" > @@ -83,8 +81,7 @@ + linkable="true"> @@ -95,11 +92,10 @@ - + linkable="true"> @@ -110,11 +106,10 @@ - + linkable="true"> @@ -125,11 +120,10 @@ - + linkable="true"> diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgunetc2.png b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgunetc2.png new file mode 100644 index 000000000..1c0d61764 Binary files /dev/null and b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgunetc2.png differ