Index: src/map/pc.c
===================================================================
--- src/map/pc.c	(revision 17128)
+++ src/map/pc.c	(working copy)
@@ -599,9 +600,10 @@
 	ep = sd->inventory_data[n]->equip;
 	if(sd->inventory_data[n]->look == W_DAGGER	||
 		sd->inventory_data[n]->look == W_1HSWORD ||
-		sd->inventory_data[n]->look == W_1HAXE) {
-		if(ep == EQP_HAND_R && (pc_checkskill(sd,AS_LEFT) > 0 || (sd->class_&MAPID_UPPERMASK) == MAPID_ASSASSIN ||
-			(sd->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO))//Kagerou and Oboro can dual wield daggers. [Rytech]
+		sd->inventory_data[n]->look == W_1HAXE ||
+		sd->inventory_data[n]->look == W_RIFLE) {
+		if(ep == EQP_HAND_R && ((sd->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO ||
+			(sd->class_&MAPID_BASEMASK) == MAPID_GUNSLINGER))//Kagerou and Oboro can dual wield daggers. [Rytech]
 			return EQP_ARMS;
 	}
 	return ep;