From 334cb48dabe76478bafcb0170c5eb526741e69da Mon Sep 17 00:00:00 2001
From: Eearslya <eearslya@gmail.com>
Date: Mon, 17 Oct 2016 23:25:07 -0700
Subject: [PATCH] Force having OOC notes set to spawn

---
 code/game/gamemodes/gameticker.dm            | 4 ++--
 code/modules/mob/new_player/new_player.dm    | 2 ++
 code/modules/mob/new_player/new_player_vr.dm | 8 ++++++++
 vorestation.dme                              | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 code/modules/mob/new_player/new_player_vr.dm

diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 3175edcf076..001102cb2ac 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -274,8 +274,8 @@ var/global/datum/controller/gameticker/ticker
 				else if(!player.mind.assigned_role)
 					continue
 				else
-					player.create_character()
-					qdel(player)
+					if (player.create_character()) // VOREStation Edit
+						qdel(player)
 
 
 	proc/collect_minds()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f50b91f2919..e5a095b9325 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -305,6 +305,7 @@
 	if(!IsJobAvailable(rank))
 		src << alert("[rank] is not available. Please try another.")
 		return 0
+	if (!attempt_vr(src,"spawn_checks_vr",list())) return 0 // VOREStation Insert
 
 	spawning = 1
 	close_spawn_windows()
@@ -396,6 +397,7 @@
 
 
 /mob/new_player/proc/create_character()
+	if (!attempt_vr(src,"spawn_checks_vr",list())) return 0 // VOREStation Insert
 	spawning = 1
 	close_spawn_windows()
 
diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm
new file mode 100644
index 00000000000..d2dbfadf523
--- /dev/null
+++ b/code/modules/mob/new_player/new_player_vr.dm
@@ -0,0 +1,8 @@
+/mob/new_player/proc/spawn_checks_vr()
+	var/pass = 1
+	if (config.allow_Metadata && client && client.prefs && (isnull(client.prefs.metadata) || length(client.prefs.metadata) < 5))
+		src << "<span class='warning'>You must first set your OOC notes before spawning in!</span>"
+		pass = 0
+	if (!pass)
+		alert(src,"There were problems with spawning your character. Check your message log for details.","Error","OK")
+	return pass
diff --git a/vorestation.dme b/vorestation.dme
index 53d658a691c..06bf659b891 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1769,6 +1769,7 @@
 #include "code\modules\mob\new_player\login_vr.dm"
 #include "code\modules\mob\new_player\logout.dm"
 #include "code\modules\mob\new_player\new_player.dm"
+#include "code\modules\mob\new_player\new_player_vr.dm"
 #include "code\modules\mob\new_player\poll.dm"
 #include "code\modules\mob\new_player\preferences_setup.dm"
 #include "code\modules\mob\new_player\skill.dm"