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 += ""
id_select += ""
- var/pda_select = "