Commiting for Aranclanos

-Fix for blindfolds not protecting from flashes
Fixes Issue 934
-Being handcuffed drops held items
Fixes Issue 975
-Can no longer abuse the holodeck to deconvert revs
Fixes Issue 968

Tested everything myself and it all works

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4829 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/effects/landmarks.dm

@@ -131,7 +131,7 @@
 	new /obj/item/clothing/under/blackskirt(src.loc)
 	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
 	new CHOICE(src.loc)
-	new /obj/item/clothing/glasses/blindfold(src.loc)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
 	del(src)
 
 /obj/effect/landmark/costume/butler/New()

code/modules/clothing/glasses/glasses.dm

@@ -1,10 +1,3 @@
-/obj/item/clothing/glasses/blindfold
-	name = "blindfold"
-	desc = "Covers the eyes, preventing sight."
-	icon_state = "blindfold"
-	item_state = "blindfold"
-	vision_flags = BLIND
-
 /obj/item/clothing/glasses/meson
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
@@ -73,6 +66,13 @@
 	item_state = "sunglasses"
 	darkness_view = -1
 
+/obj/item/clothing/glasses/sunglasses/blindfold
+	name = "blindfold"
+	desc = "Covers the eyes, preventing sight."
+	icon_state = "blindfold"
+	item_state = "blindfold"
+	vision_flags = BLIND
+
 /obj/item/clothing/glasses/sunglasses/big
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
 	icon_state = "bigsunglasses"

code/modules/mob/living/carbon/human/human_defense.dm

@@ -162,7 +162,7 @@ emp_act
 				if(prob(I.force))
 					apply_effect(20, PARALYZE, armor)
 					visible_message("\red <B>[src] has been knocked unconscious!</B>")
-					if(src != user)
+					if(src != user && I.damtype == BRUTE)
 						ticker.mode.remove_revolutionary(mind)
 
 				if(bloody)//Apply blood

code/modules/mob/living/carbon/human/life.dm

@@ -885,7 +885,7 @@
 			else if(eye_blind)			//blindness, heals slowly over time
 				eye_blind = max(eye_blind-1,0)
 				blinded = 1
-			else if(istype(glasses, /obj/item/clothing/glasses/blindfold))	//resting your eyes with a blindfold heals blurry eyes faster
+			else if(istype(glasses, /obj/item/clothing/glasses/sunglasses/blindfold))	//resting your eyes with a blindfold heals blurry eyes faster
 				eye_blurry = max(eye_blurry-3, 0)
 				blinded = 1
 			else if(eye_blurry)	//blurry eyes heal slowly

code/modules/mob/living/carbon/human/update_icons.dm

@@ -611,6 +611,8 @@ Please contact me on #coderbus IRC. ~Carn x
 
 /mob/living/carbon/human/update_inv_handcuffed(var/update_icons=1)
 	if(handcuffed)
+		drop_r_hand()
+		drop_l_hand()
 		stop_pulling()	//TODO: should be handled elsewhere
 		overlays_lying[HANDCUFF_LAYER]		= image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff2")
 		overlays_standing[HANDCUFF_LAYER]	= image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff1")
@@ -640,6 +642,7 @@ Please contact me on #coderbus IRC. ~Carn x
 		var/t_state = r_hand.item_state
 		if(!t_state)	t_state = r_hand.icon_state
 		overlays_standing[R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = "[t_state]")
+		if (handcuffed) drop_r_hand()
 	else
 		overlays_standing[R_HAND_LAYER] = null
 	if(update_icons)   update_icons()
@@ -651,6 +654,7 @@ Please contact me on #coderbus IRC. ~Carn x
 		var/t_state = l_hand.item_state
 		if(!t_state)	t_state = l_hand.icon_state
 		overlays_standing[L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = "[t_state]")
+		if (handcuffed) drop_l_hand()
 	else
 		overlays_standing[L_HAND_LAYER] = null
 	if(update_icons)   update_icons()

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -55,6 +55,7 @@
 		if(!t_state)	t_state = r_hand.icon_state
 		overlays_standing[M_R_HAND_LAYER]	= image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state)
 		r_hand.screen_loc = ui_rhand
+		if (handcuffed) drop_r_hand()
 	else
 		overlays_standing[M_R_HAND_LAYER]	= null
 	if(update_icons)		update_icons()
@@ -66,6 +67,7 @@
 		if(!t_state)	 t_state = l_hand.icon_state
 		overlays_standing[M_L_HAND_LAYER]	= image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state)
 		l_hand.screen_loc = ui_lhand
+		if (handcuffed) drop_l_hand()
 	else
 		overlays_standing[M_L_HAND_LAYER]	= null
 	if(update_icons)		update_icons()
@@ -84,6 +86,8 @@
 
 /mob/living/carbon/monkey/update_inv_handcuffed(var/update_icons=1)
 	if(handcuffed)
+		drop_r_hand()
+		drop_l_hand()
 		stop_pulling()
 		overlays_lying[M_HANDCUFF_LAYER]	= image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff2")
 		overlays_standing[M_HANDCUFF_LAYER]	= image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff1")

maps/tgstation.2.0.9.dmm

@@ -196,7 +196,7 @@
 "adN" = (/obj/structure/closet/crate,/obj/item/target/alien,/obj/item/target/alien,/turf/simulated/floor{icon_state = "dark"},/area/security/range)
 "adO" = (/obj/structure/closet/crate,/obj/item/target/syndicate,/obj/item/target/syndicate,/turf/simulated/floor{icon_state = "dark"},/area/security/range)
 "adP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/security/prison)
-"adQ" = (/obj/structure/table,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/blindfold,/turf/simulated/floor{icon_state = "dark"},/area/security/prison)
+"adQ" = (/obj/structure/table,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/sunglasses/blindfold,/turf/simulated/floor{icon_state = "dark"},/area/security/prison)
 "adR" = (/turf/simulated/floor{icon_state = "dark"},/area/security/prison)
 "adS" = (/obj/structure/stool/bed,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/prison)
 "adT" = (/obj/machinery/door/window/eastleft{name = "Lethal Injection Chamber"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "dark"},/area/security/prison)