diff --git a/src/TSMapEditor/Config/Actions.ini b/src/TSMapEditor/Config/Actions.ini
index b75098f4..16a2ffce 100644
--- a/src/TSMapEditor/Config/Actions.ini
+++ b/src/TSMapEditor/Config/Actions.ini
@@ -486,7 +486,7 @@ P2Type=Boolean
 [ParticleSystemAnimAt]
 Name=ParticleSystem Anim at
 Description=Show particle animation at waypoint location.
-P2Type=Particle
+P2Type=ParticleSystem
 P7Type=WaypointZZ
 
 [RemoveParticleSystemAnimAt]
diff --git a/src/TSMapEditor/Config/UI/Windows/SelectParticleSystemTypeWindow.ini b/src/TSMapEditor/Config/UI/Windows/SelectParticleSystemTypeWindow.ini
new file mode 100644
index 00000000..f7a1c478
--- /dev/null
+++ b/src/TSMapEditor/Config/UI/Windows/SelectParticleSystemTypeWindow.ini
@@ -0,0 +1,35 @@
+[SelectParticleSystemTypeWindow]
+$Width=250
+$Height=RESOLUTION_HEIGHT - 100
+$CC0=lblDescription:XNALabel
+$CC1=tbSearch:EditorSuggestionTextBox
+$CC2=btnSelect:EditorButton
+$CC3=lbObjectList:EditorListBox
+HasCloseButton=true
+
+
+[lblDescription]
+$X=EMPTY_SPACE_SIDES
+$Y=EMPTY_SPACE_TOP
+FontIndex=1
+Text=Select Particle System:
+
+[tbSearch]
+$X=EMPTY_SPACE_SIDES
+$Y=getBottom(lblDescription) + EMPTY_SPACE_TOP
+$Width=getWidth(SelectParticleSystemTypeWindow) - (EMPTY_SPACE_SIDES * 2)
+Suggestion=Search Particle System...
+
+[btnSelect]
+$Width=100
+$X=(getWidth(SelectParticleSystemTypeWindow) - getWidth(btnSelect)) / 2
+$Y=getHeight(SelectParticleSystemTypeWindow) - EMPTY_SPACE_BOTTOM - getHeight(btnSelect)
+Text=Select
+
+[lbObjectList]
+$X=EMPTY_SPACE_SIDES
+$Y=getBottom(tbSearch) + VERTICAL_SPACING
+$Width=getWidth(tbSearch)
+$Height=getY(btnSelect) - getY(lbObjectList) - EMPTY_SPACE_TOP
+
+
diff --git a/src/TSMapEditor/Models/Enums/RTTIType.cs b/src/TSMapEditor/Models/Enums/RTTIType.cs
index fd9c1ae2..8efadbf1 100644
--- a/src/TSMapEditor/Models/Enums/RTTIType.cs
+++ b/src/TSMapEditor/Models/Enums/RTTIType.cs
@@ -39,6 +39,7 @@ public enum RTTIType
         TeamType,
         Waypoint,
         CellTag,
-        SuperWeaponType
+        SuperWeaponType,
+        ParticleSystemType
     }
 }
diff --git a/src/TSMapEditor/Models/Enums/TriggerParamType.cs b/src/TSMapEditor/Models/Enums/TriggerParamType.cs
index 7a75e9ae..6a66f811 100644
--- a/src/TSMapEditor/Models/Enums/TriggerParamType.cs
+++ b/src/TSMapEditor/Models/Enums/TriggerParamType.cs
@@ -25,7 +25,7 @@ public enum TriggerParamType
         Speech,
         SuperWeapon,
         Animation,
-        Particle,
+        ParticleSystem,
         Waypoint,
         WaypointZZ,
         String,
diff --git a/src/TSMapEditor/Models/ParticleSystemType.cs b/src/TSMapEditor/Models/ParticleSystemType.cs
new file mode 100644
index 00000000..1b9c87f6
--- /dev/null
+++ b/src/TSMapEditor/Models/ParticleSystemType.cs
@@ -0,0 +1,24 @@
+using System.Globalization;
+
+namespace TSMapEditor.Models
+{
+    public class ParticleSystemType : AbstractObject, INIDefined
+    {
+        public ParticleSystemType(string iniName)
+        {
+            ININame = iniName;
+        }
+
+        [INI(false)]
+        public string ININame { get; }
+
+        [INI(false)]
+        public int Index { get; set; }
+
+        public string GetDisplayString() => $"{Index.ToString(CultureInfo.InvariantCulture)} {GetDisplayStringWithoutIndex()}";
+
+        public string GetDisplayStringWithoutIndex() => ININame;
+
+        public override RTTIType WhatAmI() => RTTIType.ParticleSystemType;
+    }
+}
diff --git a/src/TSMapEditor/Models/Rules.cs b/src/TSMapEditor/Models/Rules.cs
index 40e0e82f..d6047f36 100644
--- a/src/TSMapEditor/Models/Rules.cs
+++ b/src/TSMapEditor/Models/Rules.cs
@@ -28,6 +28,7 @@ public class Rules
         public List<GlobalVariable> GlobalVariables = new List<GlobalVariable>();
         public List<Weapon> Weapons = new List<Weapon>();
         public List<SuperWeaponType> SuperWeaponTypes = new List<SuperWeaponType>();
+        public List<ParticleSystemType> ParticleSystemTypes = new List<ParticleSystemType>();
 
         public List<TaskForce> TaskForces = new List<TaskForce>();
         public List<Script> Scripts = new List<Script>();
@@ -60,6 +61,7 @@ public void InitFromINI(IniFile iniFile, IInitializer initializer, bool isMapIni
             InitFromTypeSection(iniFile, "Weapons", Weapons);      // TS CnCNet ts-patches + Vinifera
             InitFromTypeSection(iniFile, "WeaponTypes", Weapons);  // YR Ares
             InitFromTypeSection(iniFile, "SuperWeaponTypes", SuperWeaponTypes);
+            InitFromTypeSection(iniFile, "ParticleSystems", ParticleSystemTypes);
             InitFromTypeSection(iniFile, "Tiberiums", TiberiumTypes);
 
             if (!isMapIni)
@@ -80,6 +82,7 @@ public void InitFromINI(IniFile iniFile, IInitializer initializer, bool isMapIni
             SmudgeTypes.ForEach(ot => initializer.ReadObjectTypePropertiesFromINI(ot, iniFile));
             Weapons.ForEach(w => initializer.ReadObjectTypePropertiesFromINI(w, iniFile));
             SuperWeaponTypes.ForEach(sw => initializer.ReadObjectTypePropertiesFromINI(sw, iniFile));
+            ParticleSystemTypes.ForEach(ps => initializer.ReadObjectTypePropertiesFromINI(ps, iniFile));
             AnimTypes.ForEach(a => initializer.ReadObjectTypePropertiesFromINI(a, iniFile));
             RulesHouseTypes.ForEach(ht => initializer.ReadObjectTypePropertiesFromINI(ht, iniFile));
             TiberiumTypes.ForEach(ht => initializer.ReadObjectTypePropertiesFromINI(ht, iniFile));
diff --git a/src/TSMapEditor/TSMapEditor.csproj b/src/TSMapEditor/TSMapEditor.csproj
index 931bc1c1..fba35872 100644
--- a/src/TSMapEditor/TSMapEditor.csproj
+++ b/src/TSMapEditor/TSMapEditor.csproj
@@ -218,6 +218,9 @@
     <None Update="Config\UI\Windows\SelectHouseTypeWindow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Config\UI\Windows\SelectParticleSystemTypeWindow.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Config\UI\Windows\SelectLocalVariableWindow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/TSMapEditor/UI/Windows/SelectParticleSystemTypeWindow.cs b/src/TSMapEditor/UI/Windows/SelectParticleSystemTypeWindow.cs
new file mode 100644
index 00000000..75612f82
--- /dev/null
+++ b/src/TSMapEditor/UI/Windows/SelectParticleSystemTypeWindow.cs
@@ -0,0 +1,46 @@
+using System;
+using Rampastring.XNAUI;
+using Rampastring.XNAUI.XNAControls;
+using TSMapEditor.Models;
+
+namespace TSMapEditor.UI.Windows
+{
+    public class SelectParticleSystemTypeWindow : SelectObjectWindow<ParticleSystemType>
+    {
+        public SelectParticleSystemTypeWindow(WindowManager windowManager, Map map) : base(windowManager)
+        {
+            this.map = map;
+        }
+
+        private readonly Map map;
+
+        public override void Initialize()
+        {
+            Name = nameof(SelectParticleSystemTypeWindow);
+            base.Initialize();
+        }
+
+        protected override void LbObjectList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (lbObjectList.SelectedItem == null)
+            {
+                SelectedObject = null;
+                return;
+            }
+
+            SelectedObject = (ParticleSystemType)lbObjectList.SelectedItem.Tag;
+        }
+
+        protected override void ListObjects()
+        {
+            lbObjectList.Clear();
+
+            foreach (ParticleSystemType particleSystemType in map.Rules.ParticleSystemTypes)
+            {
+                lbObjectList.AddItem(new XNAListBoxItem() { Text = $"{particleSystemType.Index} {particleSystemType.ININame}", Tag = particleSystemType });
+                if (particleSystemType == SelectedObject)
+                    lbObjectList.SelectedIndex = lbObjectList.Items.Count - 1;
+            }
+        }
+    }
+}
diff --git a/src/TSMapEditor/UI/Windows/TriggersWindow.cs b/src/TSMapEditor/UI/Windows/TriggersWindow.cs
index 6a9d2da7..d9136e85 100644
--- a/src/TSMapEditor/UI/Windows/TriggersWindow.cs
+++ b/src/TSMapEditor/UI/Windows/TriggersWindow.cs
@@ -91,6 +91,7 @@ public TriggersWindow(WindowManager windowManager, Map map, EditorState editorSt
         private SelectStringWindow selectStringWindow;
         private SelectSpeechWindow selectSpeechWindow;
         private SelectSoundWindow selectSoundWindow;
+        private SelectParticleSystemTypeWindow selectParticleSystemTypeWindow;
 
         private XNAContextMenu actionContextMenu;
         private XNAContextMenu eventContextMenu;
@@ -275,6 +276,10 @@ public override void Initialize()
             var soundDarkeningPanel = DarkeningPanel.InitializeAndAddToParentControlWithChild(WindowManager, Parent, selectSoundWindow);
             soundDarkeningPanel.Hidden += SoundDarkeningPanel_Hidden;
 
+            selectParticleSystemTypeWindow = new SelectParticleSystemTypeWindow(WindowManager, map);
+            var particleSystemTypeDarkeningPanel = DarkeningPanel.InitializeAndAddToParentControlWithChild(WindowManager, Parent, selectParticleSystemTypeWindow);
+            particleSystemTypeDarkeningPanel.Hidden += ParticleSystemTypeDarkeningPanel_Hidden;
+
             eventContextMenu = new XNAContextMenu(WindowManager);
             eventContextMenu.Name = nameof(eventContextMenu);
             eventContextMenu.Width = lbEvents.Width;
@@ -1006,6 +1011,11 @@ private void BtnActionParameterValuePreset_LeftClick(object sender, EventArgs e)
                     map.Rules.SuperWeaponTypes.ForEach(sw => ctxActionParameterPresetValues.AddItem(sw.GetDisplayString()));
                     ctxActionParameterPresetValues.Open(GetCursorPoint());
                     break;
+                case TriggerParamType.ParticleSystem:
+                    ParticleSystemType existingParticleSystemType = map.Rules.ParticleSystemTypes.Find(pst => pst.Index == Conversions.IntFromString(triggerAction.Parameters[paramIndex], -1));
+                    selectParticleSystemTypeWindow.IsForEvent = false;
+                    selectParticleSystemTypeWindow.Open(existingParticleSystemType);
+                    break;
                 case TriggerParamType.Speech:
                     selectSpeechWindow.IsForEvent = false;
                     EvaSpeech speech = Constants.IsRA2YR
@@ -1135,6 +1145,14 @@ private void SoundDarkeningPanel_Hidden(object sender, EventArgs e)
             AssignParamValue(selectSoundWindow.IsForEvent, Constants.IsRA2YR ? sound.Name : sound.Index.ToString(CultureInfo.InvariantCulture));
         }
 
+        private void ParticleSystemTypeDarkeningPanel_Hidden(object sender, EventArgs e)
+        {
+            if (selectParticleSystemTypeWindow.SelectedObject == null)
+                return;
+
+            AssignParamValue(selectParticleSystemTypeWindow.IsForEvent, selectParticleSystemTypeWindow.SelectedObject.Index);
+        }
+
         private void AssignParamValue(bool isForEvent, int paramValue)
         {
             if (isForEvent)
@@ -2060,6 +2078,14 @@ private string GetParamValueText(string paramValue, TriggerParamType paramType,
                         return intValue + " - nonexistent super weapon";
 
                     return intValue + " " + map.Rules.SuperWeaponTypes[intValue].GetDisplayStringWithoutIndex();
+                case TriggerParamType.ParticleSystem:
+                    if (!intParseSuccess)
+                        return paramValue;
+
+                    if (intValue >= map.Rules.ParticleSystemTypes.Count)
+                        return intValue + " - nonexistent particle system";
+
+                    return intValue + " " + map.Rules.ParticleSystemTypes[intValue].ININame;
                 case TriggerParamType.Speech:
                     EvaSpeech speech;