From 866cec8a5c279ab9c3df5ebbd0f064b5edfb74c2 Mon Sep 17 00:00:00 2001
From: Warior4356 <warior4356@yahoo.com>
Date: Fri, 14 Apr 2017 01:16:13 -0700
Subject: [PATCH] Requested changes completed

---
 code/datums/vr.dm                          | 4 ----
 code/game/machinery/computer/vr_control.dm | 4 ----
 code/modules/VR/vr_avatar.dm               | 2 +-
 code/modules/VR/vr_goggles.dm              | 3 ---
 code/modules/vr/vr_controller.dm           | 7 ++++---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/code/datums/vr.dm b/code/datums/vr.dm
index 0b2699b5ceb..4d31b6a2072 100644
--- a/code/datums/vr.dm
+++ b/code/datums/vr.dm
@@ -1,13 +1,9 @@
 /datum/map_template/vr
-	//name = "Lobby"
 	name = null
 	var/id = null // For blacklisting purposes, all vr levels need an id
 	var/description = "This is a placeholder. Please contact your virtual adminsitrator if you see this."
 	var/outfit = null
 
-	var/cost = null
-	var/allow_duplicates = TRUE
-
 	var/prefix = null
 	var/suffix = null
 
diff --git a/code/game/machinery/computer/vr_control.dm b/code/game/machinery/computer/vr_control.dm
index 3c5edfa619c..9732234d48e 100644
--- a/code/game/machinery/computer/vr_control.dm
+++ b/code/game/machinery/computer/vr_control.dm
@@ -7,11 +7,9 @@
 
 
 /obj/machinery/computer/vr_control/New()
-	//vr_control = new(src)
 	..()
 
 /obj/machinery/computer/vr_control/Destroy()
-	//qdel(vr_control)
 	return ..()
 
 /obj/machinery/computer/vr_control/attack_ai(mob/user)
@@ -26,7 +24,6 @@
 	ui_interact(user)
 
 /obj/machinery/computer/vr_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	//crew_monitor.ui_interact(user, ui_key, ui, force_open)
 	switch(alert("What would you like to do?", "VR Control", "Join Room", "Make Room", "Cancel"))
 		if("Join Room")
 			spawn_vr_avatar(user, input(user, "Choose a room to join.","Select Level") as null|anything in vr_rooms)
@@ -36,5 +33,4 @@
 			return
 
 /obj/machinery/computer/vr_control/interact(mob/user)
-	//crew_monitor.ui_interact(user)
 
diff --git a/code/modules/VR/vr_avatar.dm b/code/modules/VR/vr_avatar.dm
index 563d8e676aa..d129c261eb0 100644
--- a/code/modules/VR/vr_avatar.dm
+++ b/code/modules/VR/vr_avatar.dm
@@ -17,7 +17,7 @@
 
 /mob/living/carbon/human/virtual_reality/death()
 	return_to_lobby()
-	..()
+	return ..()
 
 /mob/living/carbon/human/virtual_reality/Destroy()
 	return_to_lobby()
diff --git a/code/modules/VR/vr_goggles.dm b/code/modules/VR/vr_goggles.dm
index 5dce094124e..c2a185b0ffa 100644
--- a/code/modules/VR/vr_goggles.dm
+++ b/code/modules/VR/vr_goggles.dm
@@ -21,9 +21,6 @@
 	vr_human.revert_to_reality(1)
 	cleanup_vr_avatar()
 
-/obj/item/clothing/glasses/vr_goggles/emag_act(mob/user)
-	//placeholder
-
 /obj/item/clothing/glasses/vr_goggles/dropped()
 	..()
 	if(vr_human)
diff --git a/code/modules/vr/vr_controller.dm b/code/modules/vr/vr_controller.dm
index 561a81e68fd..8630c0ed45b 100644
--- a/code/modules/vr/vr_controller.dm
+++ b/code/modules/vr/vr_controller.dm
@@ -45,8 +45,9 @@ proc/build_virtual_avatar(mob/living/carbon/human/H, location, datum/map_templat
 	vr_avatar.real_name = H.real_name
 	vr_avatar.undershirt = H.undershirt
 	vr_avatar.underwear = H.underwear
-	var/obj/item/organ/external/head/hd = H.get_organ("head")
-	vr_avatar.change_hair(hd.h_style)
+	//var/obj/item/organ/external/head/hd = H.get_organ("head")
+	//vr_avatar.change_hair(hd.h_style)
+	vr_avatar.UpdateAppearance()
 	vr_avatar.equipOutfit(template.outfit)
 	return vr_avatar
 
@@ -63,4 +64,4 @@ proc/spawn_vr_avatar(mob/living/carbon/human/H, datum/vr_room/room)
 
 //Preloaded rooms
 /hook/roundstart/proc/starting_levels()
-	make_vr_room("Lobby", "lobby", "0")
\ No newline at end of file
+	make_vr_room("Lobby", "lobby", 0)
\ No newline at end of file