From 7abbbdc65bd0689ff1ad155bdf51fd8509e18b39 Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Wed, 1 Dec 2021 21:14:55 +0000
Subject: [PATCH 1/8] Communications Centre & Notifications update.

!nh and similar aliases exist

Notifications look better, function way better, and function using ScrollingFrames.

Commiting to only the default theme because of conflicts in *some* other themes (You cannot tween a frames position under the influence of UIListLayout).

No screenshot provided. Look in #development.

<3
---
 MainModule/Client/Core/Variables.lua          |   1 +
 MainModule/Client/UI/Default/CommsCentre.lua  | 153 +++++++++++++
 MainModule/Client/UI/Default/Hint.rbxmx       |  12 +
 MainModule/Client/UI/Default/Message.rbxmx    |  12 +
 MainModule/Client/UI/Default/Notif.rbxmx      |  13 ++
 .../Client/UI/Default/Notification.rbxmx      | 206 +++++++++---------
 .../UI/Default/NotificationHolder.rbxmx       | 195 +++++++++++++++++
 MainModule/Client/UI/Default/Notify.rbxmx     |  12 +
 8 files changed, 504 insertions(+), 100 deletions(-)
 create mode 100644 MainModule/Client/UI/Default/CommsCentre.lua
 create mode 100644 MainModule/Client/UI/Default/NotificationHolder.rbxmx

diff --git a/MainModule/Client/Core/Variables.lua b/MainModule/Client/Core/Variables.lua
index 4a1aacc109..7a3195ab4f 100644
--- a/MainModule/Client/Core/Variables.lua
+++ b/MainModule/Client/Core/Variables.lua
@@ -112,6 +112,7 @@ return function()
 		savedUI = {};
 		localSounds = {};
 		ESPObjects = {};
+		CommunicationsHistory = {};
 		LightingSettings = {
 			Ambient = service.Lighting.Ambient;
 			Brightness = service.Lighting.Brightness;
diff --git a/MainModule/Client/UI/Default/CommsCentre.lua b/MainModule/Client/UI/Default/CommsCentre.lua
new file mode 100644
index 0000000000..7fb3fd1569
--- /dev/null
+++ b/MainModule/Client/UI/Default/CommsCentre.lua
@@ -0,0 +1,153 @@
+
+client = nil
+service = nil
+
+return function(data)
+	local gTable, window, commslog, layout;
+	local messageObjs = {};
+
+	local function newMessage(Type, Title, Message, Icon, Time, Function)
+		print(Icon)
+
+		local newMsg = commslog:Add("Frame", {
+			Size = UDim2.new(1, 0, 0, 50);
+			BackgroundTransparency = 1;
+			AutomaticSize = "Y";
+			Children = {
+				{ClassName = "Frame";
+					Name = "LoggedItem";
+					Size = UDim2.new(1, -10, 1, -10);
+					Position = UDim2.new(0, 5, 0, 5);
+					BackgroundTransparency = 0.5;
+					AutomaticSize = "Y";
+					Children = {
+						{ClassName = "ImageButton";
+							Name = "Icon";
+							Size = UDim2.new(0, 48, 0, 48);
+							Position = UDim2.new(0, 1, 0, 1);
+							Image = Icon;
+							OnClick = Function;
+							BackgroundTransparency = 1;
+						};
+
+						{ClassName = "TextButton";
+							Name = "Title";
+							Size = UDim2.new(1, -55, 0, 15);
+							Position = UDim2.new(0, 55, 0, 0);
+							Text = Title;
+							TextSize = "14";
+							TextXAlignment = "Left";
+							BackgroundTransparency = 1;
+							OnClick = Function;
+						};
+						
+						{ClassName = "TextButton";
+							Name = "Type";
+							Size = UDim2.new(1, -55, 0, 15);
+							Position = UDim2.new(0, 55, 0, 0);
+							Text = Type;
+							TextSize = "14";
+							TextXAlignment = "Right";
+							BackgroundTransparency = 1;
+							OnClick = Function;
+						};
+						
+						{ClassName = "TextButton";
+							Name = "Time";
+							Size = UDim2.new(1, -55, 0, 15);
+							Position = UDim2.new(0, 55, 0, 15);
+							Text = Time;
+							TextSize = "14";
+							TextXAlignment = "Right";
+							BackgroundTransparency = 1;
+							OnClick = Function;
+						};
+						
+						{ClassName = "TextButton";
+							Name = "Function";
+							Size = UDim2.new(1, -55, 0, 15);
+							Position = UDim2.new(0, 55, 0, 30);
+							Text = Function and "Clickable" or "Not clickable";
+							TextSize = "14";
+							TextXAlignment = "Right";
+							BackgroundTransparency = 1;
+							OnClick = Function;
+						};
+
+						{ClassName = "TextButton";
+							Name = "Message";
+							Size = UDim2.new(1, -55, 0, 10);
+							Position = UDim2.new(0, 55, 0, 15);
+							Text = Message;
+							TextXAlignment = "Left";
+							TextYAlignment = "Top";
+							AutomaticSize = "Y";
+							TextWrapped = true;
+							TextScaled = false;
+							RichText = true;
+							BackgroundTransparency = 1;
+							OnClick = Function;
+						};
+					}
+				}
+			}
+		})
+
+		table.insert(messageObjs, newMsg);
+
+		if #messageObjs > 200 then
+			messageObjs[1]:Destroy();
+			table.remove(messageObjs, 1);
+		end
+	end
+	
+	local result, code = pcall(function()
+		service.LocalizationService:GetCountryRegionForPlayerAsync(game.Players.LocalPlayer)
+	end)
+	
+	window = client.UI.Make("Window",{
+		Name  = "CommunicationsCentre";
+		Title =  (result and code == "US") and "Communications Center" or "Communications Centre";
+		Icon = client.MatIcons.Forum;
+		Size  = {500,300};
+		OnClose = function()
+			client.Variables.CommsCentreBindableEvent = nil;
+		end;
+	})
+
+	commslog = window:Add("ScrollingFrame",{
+		Size = UDim2.new(1, 0, 1, 0);
+		Position = UDim2.new(0, 0, 0, 0);
+		CanvasSize = UDim2.new(0, 0, 0, 0);
+		BackgroundTransparency = 0.9;
+	})
+
+	layout = service.New("UIListLayout", {
+		Parent = commslog;
+		FillDirection = "Vertical";
+		HorizontalAlignment = "Left";
+		VerticalAlignment = "Bottom";
+		SortOrder = "LayoutOrder";
+	})
+
+	layout:GetPropertyChangedSignal("AbsoluteContentSize"):Connect(function()
+		commslog.CanvasSize = UDim2.new(0, 0, 0, layout.AbsoluteContentSize.Y)
+		commslog.CanvasPosition = Vector2.new(0, layout.AbsoluteContentSize.Y)
+	end)
+
+	if client.Variables.CommunicationsHistory then
+		for i,v in ipairs(client.Variables.CommunicationsHistory) do
+			newMessage(v.Type, v.Title, v.Message, v.Icon, v.Time, v.Function);
+		end
+	end
+	
+	client.Variables.CommsCentreBindableEvent = service.New("BindableEvent");
+	
+	client.Variables.CommsCentreBindableEvent.Event:Connect(function(v)
+		print(v)
+		newMessage(v.Type, v.Title, v.Message, v.Icon, v.Time, v.Function)
+	end)
+
+	gTable = window.gTable
+	window:Ready();
+end
diff --git a/MainModule/Client/UI/Default/Hint.rbxmx b/MainModule/Client/UI/Default/Hint.rbxmx
index 56c9590c51..eba2420240 100644
--- a/MainModule/Client/UI/Default/Hint.rbxmx
+++ b/MainModule/Client/UI/Default/Hint.rbxmx
@@ -217,6 +217,18 @@ return function(data)
 	local str = data.Message
 	local time = data.Time or 15
 	
+	local log  = {
+		Type = "Hint";
+		Title = "Hint";
+		Message = str;
+		Icon = "rbxassetid://7501175708";
+		Time = os.date("%X");
+		Function = nil;
+	}
+
+	table.insert(client.Variables.CommunicationsHistory, log) 
+	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	
 	--client.UI.Make("HintHolder")
 	local container = client.UI.Get("HintHolder",nil,true)
 	if not container then 
diff --git a/MainModule/Client/UI/Default/Message.rbxmx b/MainModule/Client/UI/Default/Message.rbxmx
index 13175d85cb..7e9dbf4fa7 100644
--- a/MainModule/Client/UI/Default/Message.rbxmx
+++ b/MainModule/Client/UI/Default/Message.rbxmx
@@ -271,6 +271,18 @@ return function(data)
 	msg.TextStrokeTransparency = 1
 	frame.BackgroundTransparency = 1
 	
+	local log  = {
+		Type = "Full Screen Message";
+		Title = title;
+		Message = message;
+		Icon = "rbxassetid://7501175708";
+		Time = os.date("%X");
+		Function = nil;
+	}
+
+	table.insert(client.Variables.CommunicationsHistory, log) 
+	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	
 	
 	local blur = service.New("BlurEffect")
 	blur.Enabled = false
diff --git a/MainModule/Client/UI/Default/Notif.rbxmx b/MainModule/Client/UI/Default/Notif.rbxmx
index 1c23d4be4d..b09c6747cf 100644
--- a/MainModule/Client/UI/Default/Notif.rbxmx
+++ b/MainModule/Client/UI/Default/Notif.rbxmx
@@ -47,6 +47,19 @@ return function(data)
 	
 	client.UI.Remove("Notif",script.Parent.Parent)
 	
+	local log  = {
+		Type = "Notif";
+		Title = "Notif";
+		Message = str;
+		Icon = "rbxassetid://7501175708";
+		Time = os.date("%X");
+		Function = nil;
+	}
+
+	table.insert(client.Variables.CommunicationsHistory, log) 
+	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+
+	
 	if str and type(str)=="string" then
 		label.Text = str
 		label.Position = UDim2.new(0, 0, 0, ((topbar and 40) or 0) - 35)
diff --git a/MainModule/Client/UI/Default/Notification.rbxmx b/MainModule/Client/UI/Default/Notification.rbxmx
index df940d0400..d2e2e0d04b 100644
--- a/MainModule/Client/UI/Default/Notification.rbxmx
+++ b/MainModule/Client/UI/Default/Notification.rbxmx
@@ -2,7 +2,7 @@
 	<Meta name="ExplicitAutoJoints">true</Meta>
 	<External>null</External>
 	<External>nil</External>
-	<Item class="Frame" referent="RBX05F40956C3C24ADFAF4B4E1E42022B94">
+	<Item class="Frame" referent="RBX527AA466998B47409A69FB8996B5831A">
 		<Properties>
 			<bool name="Active">false</bool>
 			<Vector2 name="AnchorPoint">
@@ -36,8 +36,8 @@
 			<UDim2 name="Position">
 				<XS>0</XS>
 				<XO>0</XO>
-				<YS>1</YS>
-				<YO>-65</YO>
+				<YS>0</YS>
+				<YO>0</YO>
 			</UDim2>
 			<Ref name="RootLocalizationTable">null</Ref>
 			<float name="Rotation">0</float>
@@ -47,7 +47,7 @@
 				<XS>1</XS>
 				<XO>-5</XO>
 				<YS>0</YS>
-				<YO>60</YO>
+				<YO>35</YO>
 			</UDim2>
 			<token name="SizeConstraint">0</token>
 			<int64 name="SourceAssetId">-1</int64>
@@ -56,19 +56,19 @@
 			<bool name="Visible">true</bool>
 			<int name="ZIndex">9</int>
 		</Properties>
-		<Item class="Folder" referent="RBX4147886409804859863596D8A30737F5">
+		<Item class="Folder" referent="RBX57EF874DAC4B41A89C7C1DBB6C98903F">
 			<Properties>
 				<BinaryString name="AttributesSerialize"></BinaryString>
 				<string name="Name">Config</string>
 				<int64 name="SourceAssetId">-1</int64>
 				<BinaryString name="Tags"></BinaryString>
 			</Properties>
-			<Item class="ModuleScript" referent="RBX2F199C95244741DDAFBC32F859C96CF3">
+			<Item class="ModuleScript" referent="RBX6528FC4303E244719F834BEDD605746C">
 				<Properties>
 					<BinaryString name="AttributesSerialize"></BinaryString>
 					<Content name="LinkedSource"><null></null></Content>
 					<string name="Name">Code</string>
-					<string name="ScriptGuid">{E696A2BA-1BCA-4FEE-8F31-220766604DE3}</string>
+					<string name="ScriptGuid">{B359869B-A20E-459D-B091-42AD15D4E219}</string>
 					<ProtectedString name="Source"><![CDATA[client = nil
 cPcall = nil
 Pcall = nil
@@ -113,87 +113,54 @@ return function(data)
 		ignorefunc = client.Core.LoadCode(ignorefunc, GetEnv())
 	end
 	
-	--client.UI.Make("NotificationHolder")
 	local holder = client.UI.Get("NotificationHolder",nil,true)
-	if not holder then 
-		local hold = service.New("ScreenGui")
-		local hTable = client.UI.Register(hold)
-		local frame = service.New("ScrollingFrame", hold)
-		client.UI.Prepare(hold)
-		hTable.Name = "NotificationHolder"
-		frame.Name = "Frame"
-		frame.BackgroundTransparency = 1
-		frame.Size = UDim2.new(0, 200, 0.5, 0)
-		frame.Position = UDim2.new(1, -210, 0.5, -10)
-		frame.CanvasSize = UDim2.new(0, 0, 0, 0)
-		frame.ChildAdded:Connect(function(c)
-			if #frame:GetChildren() == 0 then
-				frame.Visible = false
-			else
-				frame.Visible = true
-			end
-		end)
-		
-		frame.ChildRemoved:Connect(function(c)
-			if #frame:GetChildren() == 0 then
-				frame.Visible = false
-			else
-				frame.Visible = true
-			end
-		end)
-		
-		holder = hTable
-		hTable:Ready()
-	end
 	
-	local function moveGuis(holder,mod)
-		local holdstuff = {}
-		for i,v in pairs(holder:GetChildren()) do
-			table.insert(holdstuff,1,v)
-		end
-		for i,v in pairs(holdstuff) do
-			v.Position = UDim2.new(0,0,1,-75*(i+mod))
-		end
-		holder.CanvasSize=UDim2.new(0,0,0,(#holder:GetChildren()*75))
-		local pos = (((#holder:GetChildren())*75) - holder.AbsoluteWindowSize.Y)
-		if pos<0 then pos = 0 end
-		holder.CanvasPosition = Vector2.new(0,pos)
+	if not holder then
+		client.UI.Make("NotificationHolder")
+		holder = client.UI.Get("NotificationHolder",nil,true)
 	end
 	
-	holder = holder.Object.Frame
+	holder = holder.Object.ScrollingFrame
 	title.Text = name
 	main.Text = text
 	iconF.Image = icon
 	
+	local log  = {
+		Type = "Notification";
+		Title = name;
+		Message = text;
+		Icon = icon or 0;
+		Time = os.date("%X");
+		Function = clickfunc;
+	}
+	
+	table.insert(client.Variables.CommunicationsHistory, log) 
+	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	
 	main.MouseButton1Click:Connect(function()
 		if frame and frame.Parent then
 			if clickfunc then
-				returner = clickfunc()
+				clickfunc()
 			end
 			frame:Destroy()
-			moveGuis(holder,0)
 		end
 	end)
 	
 	close.MouseButton1Click:Connect(function()
 		if frame and frame.Parent then
 			if closefunc then
-				returner = closefunc()
+				closefunc()
 			end
 			gTable:Destroy()
-			moveGuis(holder,0)
 		end
 	end)
 	
-	moveGuis(holder,1)
 	frame.Parent = holder
-	frame:TweenPosition(UDim2.new(0,0,1,-75),'Out','Linear',0.2)
 	
-	spawn(function()
+	task.spawn(function()
 		local sound = Instance.new("Sound",service.LocalContainer())
 		sound.SoundId = 'rbxassetid://'.."203785584"--client.NotificationSound
 		sound.Volume = 0.2
-		wait(0.1)
 		sound:Play()
 		wait(0.5)
 		sound:Destroy()
@@ -201,33 +168,27 @@ return function(data)
 	
 	if time then
 		timer.Visible = true
-		spawn(function()
-			repeat
-				timer.Text = time
-				--timer.Size=UDim2.new(0,timer.TextBounds.X,0,10)
-				wait(1)
-				time = time-1
-			until time<=0 or not frame or not frame.Parent
-			
-			if frame and frame.Parent then
-				if ignorefunc then
-					returner = ignorefunc()
-				end
-				frame:Destroy()
-				moveGuis(holder,0)
+		repeat
+			timer.Text = time
+			wait(1)
+			time = time-1
+		until time<=0 or not frame or not frame.Parent
+		
+		if frame and frame.Parent then
+			if frame then frame:Destroy() end
+			if ignorefunc then
+				ignorefunc()
 			end
-		end)
+		end
 	end
 	
-	repeat wait() until returner ~= nil or not frame or not frame.Parent
-	
 	return returner
 end]]></ProtectedString>
 					<int64 name="SourceAssetId">-1</int64>
 					<BinaryString name="Tags"></BinaryString>
 				</Properties>
 			</Item>
-			<Item class="BoolValue" referent="RBX6CF4075FD8894C7DA8ECED25EE95B175">
+			<Item class="BoolValue" referent="RBX36F26D77BF0F426C96C84F6764FB976A">
 				<Properties>
 					<BinaryString name="AttributesSerialize"></BinaryString>
 					<string name="Name">AllowMultiple</string>
@@ -236,7 +197,7 @@ end]]></ProtectedString>
 					<bool name="Value">true</bool>
 				</Properties>
 			</Item>
-			<Item class="BoolValue" referent="RBX7534694CA085492E8D203EDE1193B71B">
+			<Item class="BoolValue" referent="RBX9DB675AFEF56418E9F3B6F987ABC2ADE">
 				<Properties>
 					<BinaryString name="AttributesSerialize"></BinaryString>
 					<string name="Name">CanKeepAlive</string>
@@ -246,7 +207,7 @@ end]]></ProtectedString>
 				</Properties>
 			</Item>
 		</Item>
-		<Item class="Frame" referent="RBX15773B381EFE424E860113D1331910DE">
+		<Item class="Frame" referent="RBX7E8AFC2E6F174324A30ADA6142A1ED02">
 			<Properties>
 				<bool name="Active">false</bool>
 				<Vector2 name="AnchorPoint">
@@ -300,7 +261,7 @@ end]]></ProtectedString>
 				<bool name="Visible">true</bool>
 				<int name="ZIndex">1</int>
 			</Properties>
-			<Item class="TextButton" referent="RBX066597CDEF6246ED9C2CD216BE86F668">
+			<Item class="TextButton" referent="RBX6CBDCD8D53CB412F83DF965816F1CC84">
 				<Properties>
 					<bool name="Active">true</bool>
 					<Vector2 name="AnchorPoint">
@@ -381,7 +342,7 @@ end]]></ProtectedString>
 					<int name="ZIndex">10</int>
 				</Properties>
 			</Item>
-			<Item class="TextButton" referent="RBXE606EB0CD86F4003920B3C2B4A6C4386">
+			<Item class="TextButton" referent="RBX814F2A62D29E4892A16EA218E89C8CF4">
 				<Properties>
 					<bool name="Active">true</bool>
 					<Vector2 name="AnchorPoint">
@@ -421,7 +382,7 @@ end]]></ProtectedString>
 						<XS>0</XS>
 						<XO>5</XO>
 						<YS>0</YS>
-						<YO>26</YO>
+						<YO>35</YO>
 					</UDim2>
 					<bool name="RichText">false</bool>
 					<Ref name="RootLocalizationTable">null</Ref>
@@ -432,7 +393,7 @@ end]]></ProtectedString>
 					<UDim2 name="Size">
 						<XS>1</XS>
 						<XO>-10</XO>
-						<YS>0.519999981</YS>
+						<YS>0</YS>
 						<YO>0</YO>
 					</UDim2>
 					<token name="SizeConstraint">0</token>
@@ -445,7 +406,7 @@ end]]></ProtectedString>
 						<G>1</G>
 						<B>1</B>
 					</Color3>
-					<bool name="TextScaled">true</bool>
+					<bool name="TextScaled">false</bool>
 					<float name="TextSize">20</float>
 					<Color3 name="TextStrokeColor3">
 						<R>0</R>
@@ -461,18 +422,8 @@ end]]></ProtectedString>
 					<bool name="Visible">true</bool>
 					<int name="ZIndex">10</int>
 				</Properties>
-				<Item class="UITextSizeConstraint" referent="RBXD5AFEDF71AA8475CA83AC9590B81C8DD">
-					<Properties>
-						<BinaryString name="AttributesSerialize"></BinaryString>
-						<int name="MaxTextSize">20</int>
-						<int name="MinTextSize">12</int>
-						<string name="Name">UITextSizeConstraint</string>
-						<int64 name="SourceAssetId">-1</int64>
-						<BinaryString name="Tags"></BinaryString>
-					</Properties>
-				</Item>
 			</Item>
-			<Item class="TextLabel" referent="RBXAA1FDF3F217049FE8396A48606969DA7">
+			<Item class="TextLabel" referent="RBX34F1AC22FE4246EB96A15C4ECD31E728">
 				<Properties>
 					<bool name="Active">false</bool>
 					<Vector2 name="AnchorPoint">
@@ -519,7 +470,7 @@ end]]></ProtectedString>
 					<Ref name="SelectionImageObject">null</Ref>
 					<UDim2 name="Size">
 						<XS>1</XS>
-						<XO>-25</XO>
+						<XO>-60</XO>
 						<YS>0</YS>
 						<YO>15</YO>
 					</UDim2>
@@ -539,7 +490,7 @@ end]]></ProtectedString>
 						<G>0.352941185</G>
 						<B>0.352941185</B>
 					</Color3>
-					<float name="TextStrokeTransparency">0.800000012</float>
+					<float name="TextStrokeTransparency">1</float>
 					<float name="TextTransparency">0</float>
 					<token name="TextTruncate">0</token>
 					<bool name="TextWrapped">true</bool>
@@ -549,7 +500,7 @@ end]]></ProtectedString>
 					<int name="ZIndex">10</int>
 				</Properties>
 			</Item>
-			<Item class="TextLabel" referent="RBXAB48DF7D26B74DB7AD5017B6E77250F3">
+			<Item class="TextLabel" referent="RBX565427FB54CD4F808443DDB040FD9979">
 				<Properties>
 					<bool name="Active">false</bool>
 					<Vector2 name="AnchorPoint">
@@ -626,7 +577,7 @@ end]]></ProtectedString>
 					<int name="ZIndex">10</int>
 				</Properties>
 			</Item>
-			<Item class="ImageLabel" referent="RBX3A4ABB5EF0DC4E84A4ACE1B92916B09D">
+			<Item class="ImageLabel" referent="RBX7498F74F460D4BF582640A839BB7A0DC">
 				<Properties>
 					<bool name="Active">false</bool>
 					<Vector2 name="AnchorPoint">
@@ -714,6 +665,61 @@ end]]></ProtectedString>
 					<int name="ZIndex">10</int>
 				</Properties>
 			</Item>
+			<Item class="Frame" referent="RBXD962C7C85A4A47B19AD47A481511867C">
+				<Properties>
+					<bool name="Active">false</bool>
+					<Vector2 name="AnchorPoint">
+						<X>0</X>
+						<Y>0</Y>
+					</Vector2>
+					<BinaryString name="AttributesSerialize"></BinaryString>
+					<bool name="AutoLocalize">true</bool>
+					<token name="AutomaticSize">0</token>
+					<Color3 name="BackgroundColor3">
+						<R>1</R>
+						<G>1</G>
+						<B>1</B>
+					</Color3>
+					<float name="BackgroundTransparency">0</float>
+					<Color3 name="BorderColor3">
+						<R>0.105882362</R>
+						<G>0.164705887</G>
+						<B>0.207843155</B>
+					</Color3>
+					<token name="BorderMode">0</token>
+					<int name="BorderSizePixel">1</int>
+					<bool name="ClipsDescendants">false</bool>
+					<bool name="Draggable">false</bool>
+					<int name="LayoutOrder">0</int>
+					<string name="Name">Frame</string>
+					<Ref name="NextSelectionDown">null</Ref>
+					<Ref name="NextSelectionLeft">null</Ref>
+					<Ref name="NextSelectionRight">null</Ref>
+					<Ref name="NextSelectionUp">null</Ref>
+					<UDim2 name="Position">
+						<XS>0</XS>
+						<XO>5</XO>
+						<YS>0</YS>
+						<YO>30</YO>
+					</UDim2>
+					<Ref name="RootLocalizationTable">null</Ref>
+					<float name="Rotation">0</float>
+					<bool name="Selectable">false</bool>
+					<Ref name="SelectionImageObject">null</Ref>
+					<UDim2 name="Size">
+						<XS>1</XS>
+						<XO>-10</XO>
+						<YS>0</YS>
+						<YO>1</YO>
+					</UDim2>
+					<token name="SizeConstraint">0</token>
+					<int64 name="SourceAssetId">-1</int64>
+					<token name="Style">0</token>
+					<BinaryString name="Tags"></BinaryString>
+					<bool name="Visible">true</bool>
+					<int name="ZIndex">1</int>
+				</Properties>
+			</Item>
 		</Item>
 	</Item>
-</roblox>
+</roblox>
\ No newline at end of file
diff --git a/MainModule/Client/UI/Default/NotificationHolder.rbxmx b/MainModule/Client/UI/Default/NotificationHolder.rbxmx
new file mode 100644
index 0000000000..dc74b92f0b
--- /dev/null
+++ b/MainModule/Client/UI/Default/NotificationHolder.rbxmx
@@ -0,0 +1,195 @@
+<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
+	<Meta name="ExplicitAutoJoints">true</Meta>
+	<External>null</External>
+	<External>nil</External>
+	<Item class="ScreenGui" referent="RBXC2BB6723FB63491CBFF9B1A0B1DE19FD">
+		<Properties>
+			<BinaryString name="AttributesSerialize"></BinaryString>
+			<bool name="AutoLocalize">true</bool>
+			<int name="DisplayOrder">0</int>
+			<bool name="Enabled">true</bool>
+			<bool name="IgnoreGuiInset">false</bool>
+			<string name="Name">NotificationHolder</string>
+			<bool name="ResetOnSpawn">true</bool>
+			<Ref name="RootLocalizationTable">null</Ref>
+			<int64 name="SourceAssetId">-1</int64>
+			<BinaryString name="Tags"></BinaryString>
+			<token name="ZIndexBehavior">1</token>
+		</Properties>
+		<Item class="Folder" referent="RBX957D5A1EC9F64FEDB2ED7617DDC6AAEF">
+			<Properties>
+				<BinaryString name="AttributesSerialize"></BinaryString>
+				<string name="Name">Config</string>
+				<int64 name="SourceAssetId">-1</int64>
+				<BinaryString name="Tags"></BinaryString>
+			</Properties>
+			<Item class="ModuleScript" referent="RBX590C2FFB6CC84FDE899D4AD2FDEB5802">
+				<Properties>
+					<BinaryString name="AttributesSerialize"></BinaryString>
+					<Content name="LinkedSource"><null></null></Content>
+					<string name="Name">Code</string>
+					<string name="ScriptGuid">{871328FA-5293-4B38-9242-013510D79BEF}</string>
+					<ProtectedString name="Source"><![CDATA[client = nil
+cPcall = nil
+Pcall = nil
+Routine = nil
+service = nil
+gTable = nil
+
+return function(data)
+	local gui = script.Parent.Parent
+	local ScrollingFrame = gui.ScrollingFrame
+	local currentChildren = 0 -- A supprisingly good way to do it in terms of lag.
+	ScrollingFrame.ChildAdded:Connect(function(child)
+		currentChildren += 1
+		local textSize = service.TextService:GetTextSize(child.Frame.Main.Text, child.Frame.Main.TextSize, child.Frame.Main.Font, Vector2.new(229,2147483647)).Y
+		child.Size = child.Size + UDim2.new(0, 0, 0, textSize + 5)
+		child.Frame.Main.Size = child.Frame.Main.Size + UDim2.new(0, 0, 0, textSize + 5)
+		--[[
+		It works. Makes the scroll bar snap to the bottom of the screen,
+		only if it was already on the bottom of the scrollingframe,
+		but has to account for the canvas size being 0,
+		which occurs when there is no room to scoll
+		(all notifications total size with padding less than 300).
+		
+		This took me about a quater of an hour to perfect.
+		
+		It's just basic arithmatic...
+		
+		I hate math.
+		]]--
+		if ScrollingFrame.CanvasPosition.Y + child.AbsoluteSize.Y + 5 == ScrollingFrame.AbsoluteCanvasSize.Y - ScrollingFrame.AbsoluteWindowSize.Y or child.AbsoluteSize.Y > ScrollingFrame.AbsoluteCanvasSize.Y - ScrollingFrame.AbsoluteWindowSize.Y then
+			ScrollingFrame.CanvasPosition = ScrollingFrame.CanvasPosition + child.AbsoluteSize + Vector2.new(0,5)
+		end
+	end)
+	
+	ScrollingFrame.ChildRemoved:Connect(function(child)
+		currentChildren -= 1
+		if currentChildren == 0 then
+			gui:Destroy()
+		end
+	end)
+	gTable:Ready()
+end]]></ProtectedString>
+					<int64 name="SourceAssetId">-1</int64>
+					<BinaryString name="Tags"></BinaryString>
+				</Properties>
+			</Item>
+			<Item class="BoolValue" referent="RBXAEC175D422D44CFF9B2B0F15CF75E75B">
+				<Properties>
+					<BinaryString name="AttributesSerialize"></BinaryString>
+					<string name="Name">AllowMultiple</string>
+					<int64 name="SourceAssetId">-1</int64>
+					<BinaryString name="Tags"></BinaryString>
+					<bool name="Value">false</bool>
+				</Properties>
+			</Item>
+			<Item class="BoolValue" referent="RBXF5F3C9F8795E423AAB1CD44CAA24A16B">
+				<Properties>
+					<BinaryString name="AttributesSerialize"></BinaryString>
+					<string name="Name">CanKeepAlive</string>
+					<int64 name="SourceAssetId">-1</int64>
+					<BinaryString name="Tags"></BinaryString>
+					<bool name="Value">true</bool>
+				</Properties>
+			</Item>
+		</Item>
+		<Item class="ScrollingFrame" referent="RBXD0FC9F342AB145EE91E92A5796F88D65">
+			<Properties>
+				<bool name="Active">true</bool>
+				<Vector2 name="AnchorPoint">
+					<X>0</X>
+					<Y>0</Y>
+				</Vector2>
+				<BinaryString name="AttributesSerialize"></BinaryString>
+				<bool name="AutoLocalize">true</bool>
+				<token name="AutomaticCanvasSize">2</token>
+				<token name="AutomaticSize">0</token>
+				<Color3 name="BackgroundColor3">
+					<R>1</R>
+					<G>1</G>
+					<B>1</B>
+				</Color3>
+				<float name="BackgroundTransparency">1</float>
+				<Color3 name="BorderColor3">
+					<R>0.105882362</R>
+					<G>0.164705887</G>
+					<B>0.207843155</B>
+				</Color3>
+				<token name="BorderMode">0</token>
+				<int name="BorderSizePixel">0</int>
+				<Content name="BottomImage"><url>rbxasset://textures/ui/Scroll/scroll-bottom.png</url></Content>
+				<Vector2 name="CanvasPosition">
+					<X>0</X>
+					<Y>0</Y>
+				</Vector2>
+				<UDim2 name="CanvasSize">
+					<XS>0</XS>
+					<XO>0</XO>
+					<YS>0</YS>
+					<YO>0</YO>
+				</UDim2>
+				<bool name="ClipsDescendants">true</bool>
+				<bool name="Draggable">false</bool>
+				<token name="ElasticBehavior">0</token>
+				<token name="HorizontalScrollBarInset">0</token>
+				<int name="LayoutOrder">0</int>
+				<Content name="MidImage"><url>rbxasset://textures/ui/Scroll/scroll-middle.png</url></Content>
+				<string name="Name">ScrollingFrame</string>
+				<Ref name="NextSelectionDown">null</Ref>
+				<Ref name="NextSelectionLeft">null</Ref>
+				<Ref name="NextSelectionRight">null</Ref>
+				<Ref name="NextSelectionUp">null</Ref>
+				<UDim2 name="Position">
+					<XS>1</XS>
+					<XO>-255</XO>
+					<YS>1</YS>
+					<YO>-350</YO>
+				</UDim2>
+				<Ref name="RootLocalizationTable">null</Ref>
+				<float name="Rotation">0</float>
+				<Color3 name="ScrollBarImageColor3">
+					<R>0</R>
+					<G>0</G>
+					<B>0</B>
+				</Color3>
+				<float name="ScrollBarImageTransparency">0</float>
+				<int name="ScrollBarThickness">6</int>
+				<token name="ScrollingDirection">2</token>
+				<bool name="ScrollingEnabled">true</bool>
+				<bool name="Selectable">true</bool>
+				<Ref name="SelectionImageObject">null</Ref>
+				<UDim2 name="Size">
+					<XS>0</XS>
+					<XO>250</XO>
+					<YS>0</YS>
+					<YO>300</YO>
+				</UDim2>
+				<token name="SizeConstraint">0</token>
+				<int64 name="SourceAssetId">-1</int64>
+				<BinaryString name="Tags"></BinaryString>
+				<Content name="TopImage"><url>rbxasset://textures/ui/Scroll/scroll-top.png</url></Content>
+				<token name="VerticalScrollBarInset">2</token>
+				<token name="VerticalScrollBarPosition">0</token>
+				<bool name="Visible">true</bool>
+				<int name="ZIndex">1</int>
+			</Properties>
+			<Item class="UIListLayout" referent="RBX98FCE349ED014E459EA01E9832A86DC8">
+				<Properties>
+					<BinaryString name="AttributesSerialize"></BinaryString>
+					<token name="FillDirection">1</token>
+					<token name="HorizontalAlignment">1</token>
+					<string name="Name">UIListLayout</string>
+					<UDim name="Padding">
+						<S>0</S>
+						<O>5</O>
+					</UDim>
+					<token name="SortOrder">2</token>
+					<int64 name="SourceAssetId">-1</int64>
+					<BinaryString name="Tags"></BinaryString>
+					<token name="VerticalAlignment">2</token>
+				</Properties>
+			</Item>
+		</Item>
+	</Item>
+</roblox>
\ No newline at end of file
diff --git a/MainModule/Client/UI/Default/Notify.rbxmx b/MainModule/Client/UI/Default/Notify.rbxmx
index 1f0342b231..a1b5083ec1 100644
--- a/MainModule/Client/UI/Default/Notify.rbxmx
+++ b/MainModule/Client/UI/Default/Notify.rbxmx
@@ -64,6 +64,18 @@ return function(data)
 	msg.TextStrokeTransparency = 1
 	frame.BackgroundTransparency = 1
 	
+	local log  = {
+		Type = "Small Screen Message";
+		Title = title;
+		Message = message;
+		Icon = "rbxassetid://7501175708";
+		Time = os.date("%X");
+		Function = nil;
+	}
+
+	table.insert(client.Variables.CommunicationsHistory, log) 
+	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	
 	local fadeSteps = 10
 	local blurSize = 10
 	local textFade = 0.1

From ef3263b4b343e1f486dfbb5abafff2bb3d6013ff Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:31:36 +0000
Subject: [PATCH 2/8] Update CommsCentre.lua

---
 MainModule/Client/UI/Default/CommsCentre.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/MainModule/Client/UI/Default/CommsCentre.lua b/MainModule/Client/UI/Default/CommsCentre.lua
index 7fb3fd1569..5d93a61cd5 100644
--- a/MainModule/Client/UI/Default/CommsCentre.lua
+++ b/MainModule/Client/UI/Default/CommsCentre.lua
@@ -141,10 +141,7 @@ return function(data)
 		end
 	end
 	
-	client.Variables.CommsCentreBindableEvent = service.New("BindableEvent");
-	
-	client.Variables.CommsCentreBindableEvent.Event:Connect(function(v)
-		print(v)
+	service.HookEvent('ToggleConsole', function()
 		newMessage(v.Type, v.Title, v.Message, v.Icon, v.Time, v.Function)
 	end)
 

From bf2b5e0784007156a9706e29f2b3b31194ed8e4e Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:34:02 +0000
Subject: [PATCH 3/8] Update Hint.rbxmx

---
 MainModule/Client/UI/Default/Hint.rbxmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MainModule/Client/UI/Default/Hint.rbxmx b/MainModule/Client/UI/Default/Hint.rbxmx
index eba2420240..50ab0b5bb7 100644
--- a/MainModule/Client/UI/Default/Hint.rbxmx
+++ b/MainModule/Client/UI/Default/Hint.rbxmx
@@ -227,7 +227,7 @@ return function(data)
 	}
 
 	table.insert(client.Variables.CommunicationsHistory, log) 
-	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	service.Events.CommsCentre:fire(log)
 	
 	--client.UI.Make("HintHolder")
 	local container = client.UI.Get("HintHolder",nil,true)
@@ -333,4 +333,4 @@ end]]></ProtectedString>
 			</Item>
 		</Item>
 	</Item>
-</roblox>
\ No newline at end of file
+</roblox>

From 32c39a52a3bfc406a08eaa832e1c0b233edfc658 Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:34:27 +0000
Subject: [PATCH 4/8] Update CommsCentre.lua

---
 MainModule/Client/UI/Default/CommsCentre.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MainModule/Client/UI/Default/CommsCentre.lua b/MainModule/Client/UI/Default/CommsCentre.lua
index 5d93a61cd5..590cdc539c 100644
--- a/MainModule/Client/UI/Default/CommsCentre.lua
+++ b/MainModule/Client/UI/Default/CommsCentre.lua
@@ -141,7 +141,7 @@ return function(data)
 		end
 	end
 	
-	service.HookEvent('ToggleConsole', function()
+	service.HookEvent('CommsCentre', function(v)
 		newMessage(v.Type, v.Title, v.Message, v.Icon, v.Time, v.Function)
 	end)
 

From 69f6e1fef84b50f8376c809851d3af0c0ffa2f3d Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:34:57 +0000
Subject: [PATCH 5/8] Update Message.rbxmx

---
 MainModule/Client/UI/Default/Message.rbxmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MainModule/Client/UI/Default/Message.rbxmx b/MainModule/Client/UI/Default/Message.rbxmx
index 7e9dbf4fa7..8711ab954d 100644
--- a/MainModule/Client/UI/Default/Message.rbxmx
+++ b/MainModule/Client/UI/Default/Message.rbxmx
@@ -281,7 +281,7 @@ return function(data)
 	}
 
 	table.insert(client.Variables.CommunicationsHistory, log) 
-	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	service.Events.CommsCentre:fire(log)
 	
 	
 	local blur = service.New("BlurEffect")

From 0b2deb8f98059abe99b557d13eb0485741bb6b37 Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:35:12 +0000
Subject: [PATCH 6/8] Update Notif.rbxmx

---
 MainModule/Client/UI/Default/Notif.rbxmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MainModule/Client/UI/Default/Notif.rbxmx b/MainModule/Client/UI/Default/Notif.rbxmx
index b09c6747cf..2567915aac 100644
--- a/MainModule/Client/UI/Default/Notif.rbxmx
+++ b/MainModule/Client/UI/Default/Notif.rbxmx
@@ -57,7 +57,7 @@ return function(data)
 	}
 
 	table.insert(client.Variables.CommunicationsHistory, log) 
-	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	service.Events.CommsCentre:fire(log)
 
 	
 	if str and type(str)=="string" then
@@ -169,4 +169,4 @@ end]]></ProtectedString>
 			</Properties>
 		</Item>
 	</Item>
-</roblox>
\ No newline at end of file
+</roblox>

From 33fc2493f277b530cece9b04606bae691bc47e51 Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:35:49 +0000
Subject: [PATCH 7/8] Update Notification.rbxmx

---
 MainModule/Client/UI/Default/Notification.rbxmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MainModule/Client/UI/Default/Notification.rbxmx b/MainModule/Client/UI/Default/Notification.rbxmx
index d2e2e0d04b..bf72b481a2 100644
--- a/MainModule/Client/UI/Default/Notification.rbxmx
+++ b/MainModule/Client/UI/Default/Notification.rbxmx
@@ -135,7 +135,7 @@ return function(data)
 	}
 	
 	table.insert(client.Variables.CommunicationsHistory, log) 
-	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	service.Events.CommsCentre:fire(log)
 	
 	main.MouseButton1Click:Connect(function()
 		if frame and frame.Parent then
@@ -722,4 +722,4 @@ end]]></ProtectedString>
 			</Item>
 		</Item>
 	</Item>
-</roblox>
\ No newline at end of file
+</roblox>

From 1e0069e293f6c0a0dc848735d3f3668689ddd551 Mon Sep 17 00:00:00 2001
From: P3tray <31691973+P3tray@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:36:37 +0000
Subject: [PATCH 8/8] Update Notify.rbxmx

---
 MainModule/Client/UI/Default/Notify.rbxmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MainModule/Client/UI/Default/Notify.rbxmx b/MainModule/Client/UI/Default/Notify.rbxmx
index a1b5083ec1..2af7bbcc4b 100644
--- a/MainModule/Client/UI/Default/Notify.rbxmx
+++ b/MainModule/Client/UI/Default/Notify.rbxmx
@@ -74,7 +74,7 @@ return function(data)
 	}
 
 	table.insert(client.Variables.CommunicationsHistory, log) 
-	if client.Variables.CommsCentreBindableEvent then client.Variables.CommsCentreBindableEvent:Fire(log) end
+	service.Events.CommsCentre:fire(log)
 	
 	local fadeSteps = 10
 	local blurSize = 10
@@ -432,4 +432,4 @@ end]]></ProtectedString>
 			</Item>
 		</Item>
 	</Item>
-</roblox>
\ No newline at end of file
+</roblox>