Merge pull request #110 from SynapseSL/patch

Synapse 2.10.1

Author: GrafDimenzio

Synapse/Api/CustomObjects/SynapseDoorObject.cs

@@ -35,6 +35,11 @@ public SynapseDoorObject(SpawnableDoorType type, Vector3 position, Quaternion ro
         public override GameObject GameObject => Door.GameObject;
         public override NetworkIdentity NetworkIdentity => Door.VDoor.netIdentity;
         public override ObjectType Type => ObjectType.Door;
+        public override void Destroy()
+        {
+            Map.Get.Doors.Remove(Door);
+            base.Destroy();
+        }
 
         public Door Door { get; }
         public SpawnableDoorType DoorType { get; }

Synapse/Api/CustomObjects/SynapseGeneratorObject.cs

@@ -32,6 +32,12 @@ internal SynapseGeneratorObject(SynapseSchematic.GeneratorConfiguration configur
         public override GameObject GameObject => Generator.GameObject;
         public override NetworkIdentity NetworkIdentity => Generator.generator.netIdentity;
         public override ObjectType Type => ObjectType.Generator;
+        public override void Destroy()
+        {
+            //The Generator will add itself on first Start to Map.Generators
+            Map.Get.Generators.Remove(Generator);
+            base.Destroy();
+        }
 
         public Generator Generator { get; }
     }

Synapse/Api/CustomObjects/SynapseLockerObject.cs

@@ -42,6 +42,11 @@ internal SynapseLockerObject(SynapseSchematic.LockerConfiguration configuration)
         public override NetworkIdentity NetworkIdentity => Locker.locker.netIdentity;
         public override GameObject GameObject => Locker.GameObject;
         public override ObjectType Type => ObjectType.Locker;
+        public override void Destroy()
+        {
+            Map.Get.Lockers.Remove(Locker);
+            base.Destroy();
+        }
 
         public LockerType LockerType { get; }
 

Synapse/Api/CustomObjects/SynapseRagdollObject.cs

@@ -42,6 +42,11 @@ public override void ApplyPhysics()
             foreach (var rigid in Ragdoll.ragdoll.AllRigidbodies)
                 rigid.useGravity = true;
         }
+        public override void Destroy()
+        {
+            Map.Get.Ragdolls.Remove(Ragdoll);
+            base.Destroy();
+        }
 
         public RoleType RoleType => Ragdoll.RoleType;
         public DamageType DamageType => Ragdoll.ragdoll.Info.Handler.GetDamageType();

Synapse/Api/CustomObjects/SynapseWorkStationObject.cs

@@ -44,6 +44,11 @@ public SynapseWorkStationObject(Vector3 position, Quaternion rotation, Vector3 s
         public override GameObject GameObject => WorkStation.GameObject;
         public override NetworkIdentity NetworkIdentity => WorkStation.workStation.netIdentity;
         public override ObjectType Type => ObjectType.Workstation;
+        public override void Destroy()
+        {
+            Map.Get.WorkStations.Remove(WorkStation);
+            base.Destroy();
+        }
 
 
         public WorkStation WorkStation { get; }

Synapse/Api/Enum/Effect.cs

@@ -136,7 +136,7 @@ public enum Effect
         /// <summary>
         /// Increases movement speed
         /// </summary>
-        /// <remarks>0 = Disabled, each intensity point adds 1% of movement speed (max 355)</remarks>
+        /// <remarks>0 = Disabled, each intensity point adds 1% of movement speed (max 255)</remarks>
         MovementBoost,
         /// <summary>
         /// Reduces severity of Amnesia, Bleeding, Burned, Concussed, Hemorrhage, Poisoned and SCP-207.
@@ -158,5 +158,10 @@ public enum Effect
         /// </summary>
         /// <remarks>0 = Disabled, 1 = Enabled</remarks>
         Vitality,
+        /// <summary>
+        /// Turns the screen black.
+        /// </summary>
+        /// <remarks>0 = Disabled, 1 = Enabled</remarks>
+        Visuals173Blink
     }
 }

Synapse/Api/Events/ScpEvents.cs

@@ -1,4 +1,4 @@
-using Synapse.Api.Enum;
+using Synapse.Api.Enum;
 using Synapse.Api.Events.SynapseEventArguments;
 using UnityEngine;
 

Synapse/Api/Events/SynapseEventArguments/ScpEventArgs.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace Synapse.Api.Events.SynapseEventArguments
 {
@@ -152,4 +152,4 @@ public class Scp049ReviveEvent : EventHandler.ISynapseEventArgs
         public bool Finish { get; internal set; }
         public bool Allow { get; set; } = true;
     }
-}
+}

Synapse/Api/Map.cs

@@ -136,8 +136,9 @@ public SynapseItem SpawnGrenade(Vector3 position, Vector3 velocity, float fuseti
             var grenadeitem = new SynapseItem(itemtype, position);
             grenadeitem.Throwable.Fuse();
             grenadeitem.Throwable.FuseTime = fusetime;
-            if (player != null)
-                grenadeitem.Throwable.ThrowableItem.PreviousOwner = new Footprinting.Footprint(player.Hub);
+
+            if (player == null) player = Server.Get.Host;
+            grenadeitem.Throwable.ThrowableItem.PreviousOwner = new Footprinting.Footprint(player.Hub);
 
             if(grenadeitem.Throwable.ThrowableItem.TryGetComponent<Rigidbody>(out var rgb))
                 rgb.velocity = velocity;

Synapse/Api/Player.cs

@@ -78,11 +78,13 @@ public uint GetPreference(ItemType item)
 
         public void ChangeRoleAtPosition(RoleType role)
         {
-            RoleChangeClassIdPatch.ForceLite = true;
+            LiteRoleSet = true;
             Hub.characterClassManager.SetClassIDAdv(role, true, CharacterClassManager.SpawnReason.ForceClass);
-            RoleChangeClassIdPatch.ForceLite = false;
+            LiteRoleSet = false;
         }
 
+        internal bool LiteRoleSet { get; set; } = false;
+
         public void GiveTextHint(string message, float duration = 5f)
         {
             Hub.hints.Show(new TextHint(message, new HintParameter[]