From ef16165471b9e72915833281fd9d256370108ddb Mon Sep 17 00:00:00 2001
From: Mark van Alphen <markvanalphen2@gmail.com>
Date: Sun, 9 Jun 2019 23:27:06 +0200
Subject: [PATCH] More outfit fixes

---
 code/datums/outfits/vv_outfit.dm              | 7 ++++---
 code/modules/admin/outfits.dm                 | 6 +++---
 code/modules/admin/verbs/debug.dm             | 2 +-
 code/modules/mob/living/carbon/human/human.dm | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm
index 791949fc0c2..7a07b087ae8 100644
--- a/code/datums/outfits/vv_outfit.dm
+++ b/code/datums/outfits/vv_outfit.dm
@@ -88,6 +88,7 @@
 		var/obj/item/card/id/ID = id_slot.GetID()
 		if(ID && ID.registered_name == real_name)
 			O.update_id_name = TRUE
+
 	//Copy hands
 	if(l_hand || r_hand) //Not in the mood to let outfits transfer amputees
 		var/obj/item/left_hand = l_hand
@@ -129,10 +130,10 @@
 			O.cybernetic_implants |= CI.type
 
 	// Copy accessories
-	if(O.uniform)
-		var/obj/item/clothing/under/U = O.uniform
+	var/obj/item/clothing/under/uniform_slot = get_item_by_slot(slot_w_uniform)
+	if(uniform_slot)
 		O.accessories = list()
-		for(var/obj/item/clothing/accessory/A in U.accessories)
+		for(var/obj/item/clothing/accessory/A in uniform_slot.accessories)
 			if(istype(A))
 				O.accessories |= A
 
diff --git a/code/modules/admin/outfits.dm b/code/modules/admin/outfits.dm
index 2b109c7ecfe..336edc89c88 100644
--- a/code/modules/admin/outfits.dm
+++ b/code/modules/admin/outfits.dm
@@ -1,7 +1,7 @@
 GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 
 /client/proc/outfit_manager()
-	set category = "Debug"
+	set category = "Event"
 	set name = "Outfit Manager"
 
 	if(!check_rights(R_EVENT))
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 		id_select += "<option value=\"[path]\">[path]</option>"
 	id_select += "</select>"
 
-	var/pda_select = "<select name=\"outfit_id\"><option value=\"\">None</option>"
+	var/pda_select = "<select name=\"outfit_pda\"><option value=\"\">None</option>"
 	for(var/path in pdas)
 		pda_select += "<option value=\"[path]\">[path]</option>"
 	pda_select += "</select>"
@@ -259,4 +259,4 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	O.r_ear = text2path(href_list["outfit_r_ear"])
 
 	GLOB.custom_outfits.Add(O)
-	message_admins("[key_name(usr)] created \"[O.name]\" outfit!")
+	message_admins("[key_name_admin(usr)] created \"[O.name]\" outfit.")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 00f106e7870..3efeb985b6f 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -576,7 +576,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!check_rights(R_EVENT))
 		return
 
-	if(!ishuman(M) || !isobserver(M))
+	if(!ishuman(M) && !isobserver(M))
 		alert("Invalid mob")
 		return
 
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 70c679cb163..4dd394ab2ed 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1934,7 +1934,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 	. = ..()
 	. += "---"
 	.["Set Species"] = "?_src_=vars;setspecies=[UID()]"
-	.["Copy outfit"] = "?_src_=vars;copyoutfit=[UID()]"
+	.["Copy Outfit"] = "?_src_=vars;copyoutfit=[UID()]"
 	.["Make AI"] = "?_src_=vars;makeai=[UID()]"
 	.["Make Mask of Nar'sie"] = "?_src_=vars;makemask=[UID()]"
 	.["Make cyborg"] = "?_src_=vars;makerobot=[UID()]"