Merge branch 'master' into polaris-sync-2018-03-15

code/modules/admin/admin.dm

@@ -6,7 +6,7 @@ var/global/floorIsLava = 0
 ////////////////////////////////
 /proc/message_admins(var/msg)
 	msg = "<span class=\"log_message\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
-	log_adminwarn(msg)
+	//log_adminwarn(msg) //log_and_message_admins is for this
 	for(var/client/C in admins)
 		if((R_ADMIN|R_MOD) & C.holder.rights)
 			C << msg

code/modules/admin/verbs/adminpm.dm

@@ -104,7 +104,7 @@
 	if(C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
 		C << 'sound/effects/adminhelp.ogg'
 
-	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
+	log_adminpm(msg,src,C)
 	send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
 
 	//we don't use message_admins here because the sender/receiver might get it too

code/modules/mob/new_player/sprite_accessories.dm

@@ -1214,14 +1214,6 @@
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
 		species_allowed = list(SPECIES_TAJ)
 
-	// VOREStation edit - Illegal Edit, This will fail - https://github.com/VOREStation/VOREStation/pull/2335
-	panda_eye_marks
-		name = "Panda Eye Markings"
-		icon_state = "eyes-panda"
-		body_parts = list(BP_HEAD)
-		species_allowed = list(SPECIES_HUMAN)
-	// VOREStation Edit End
-
 	patches
 		name = "Color Patches"
 		icon_state = "patches"

code/modules/mob/new_player/sprite_accessories_vr.dm

@@ -857,6 +857,12 @@
 		icon_state = "animeeyesouter"
 		body_parts = list(BP_HEAD)
 
+	panda_eye_marks
+		name = "Panda Eye Markings"
+		icon_state = "eyes_panda"
+		body_parts = list(BP_HEAD)
+		species_allowed = list("Human")
+
 	catwomantorso
 		name = "Catwoman chest stripes"
 		icon_state = "catwomanchest"