Merge branch 'virgoMaster' into virgoPull

code/game/objects/items/apc_frame.dm

@@ -13,31 +13,31 @@
 		new /obj/item/stack/material/steel( get_turf(src.loc), 2 )
 		qdel(src)
 
-/obj/item/frame/apc/try_build(turf/on_wall)
-	if (get_dist(on_wall,usr)>1)
+/obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob)
+	if (get_dist(on_wall, user)>1)
 		return
-	var/ndir = get_dir(usr,on_wall)
+	var/ndir = get_dir(user, on_wall)
 	if (!(ndir in cardinal))
 		return
-	var/turf/loc = get_turf(usr)
+	var/turf/loc = get_turf(user)
 	var/area/A = loc.loc
 	if (!istype(loc, /turf/simulated/floor))
-		usr << "<span class='warning'>APC cannot be placed on this spot.</span>"
+		to_chat(user, "<span class='warning'>APC cannot be placed on this spot.</span>")
 		return
 	if (A.requires_power == 0 || istype(A, /area/space))
-		usr << "<span class='warning'>APC cannot be placed in this area.</span>"
+		to_chat(user, "<span class='warning'>APC cannot be placed in this area.</span>")
 		return
 	if (A.get_apc())
-		usr << "<span class='warning'>This area already has an APC.</span>"
+		to_chat(user, "<span class='warning'>This area already has an APC.</span>")
 		return //only one APC per area
 	for(var/obj/machinery/power/terminal/T in loc)
 		if (T.master)
-			usr << "<span class='warning'>There is another network terminal here.</span>"
+			to_chat(user, "<span class='warning'>There is another network terminal here.</span>")
 			return
 		else
 			var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc)
 			C.amount = 10
-			usr << "You cut the cables and disassemble the unused power terminal."
+			to_chat(user, "You cut the cables and disassemble the unused power terminal.")
 			qdel(T)
 	new /obj/machinery/power/apc(loc, ndir, 1)
 	qdel(src)

code/game/objects/items/weapons/handcuffs_vr.dm

@@ -0,0 +1,5 @@
+/obj/item/weapon/handcuffs/legcuffs/fuzzy
+	name = "fuzzy legcuffs"
+	desc = "Use this to keep... 'prisoners' in line."
+	icon = 'icons/obj/items_vr.dmi'
+	icon_state = "fuzzylegcuff"

code/game/objects/items/weapons/storage/backpack_vr.dm

@@ -94,6 +94,13 @@
 				else
 					slowdown = initial(slowdown)
 				return 1
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/deer))
+				item_state = "[icon_base]_Deer"
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
+					slowdown = 0
+				else
+					slowdown = initial(slowdown)
+				return 1
 			else
 				H << "<span class='warning'>[no_message]</span>"
 				return 0

code/game/objects/items/weapons/storage/quickdraw.dm

@@ -49,6 +49,7 @@
 	if(src.loc == user) //Are they carrying us?
 		toggle_quickdraw()
 
+
 // If we start adding more of these, we'll need to make them their own folder. 'til then, this one should be fine.
 
 // -----------------------------

code/game/objects/random/random.dm

@@ -274,7 +274,7 @@
 				prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
 				prob(1);/obj/item/weapon/beartrap,
 				prob(1);/obj/item/weapon/handcuffs/fuzzy,
-				prob(1);/obj/item/weapon/handcuffs/legcuffs,
+				prob(1);/obj/item/weapon/handcuffs/legcuffs/fuzzy,
 				prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,
 				prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
 				prob(4);/obj/item/device/radio_jammer,

code/game/objects/structures/crates_lockers/largecrate_vr.dm

@@ -54,6 +54,7 @@
 						/mob/living/simple_animal/hostile/bear/brown;0.5,
 						/mob/living/simple_animal/hostile/carp,
 						/mob/living/simple_animal/hostile/mimic,
+						/mob/living/simple_animal/hostile/rous,
 						/mob/living/simple_animal/otie;0.5)
 	..()
 

code/game/objects/structures/window.dm

@@ -311,7 +311,7 @@
 				qdel(src)
 	else if(istype(W,/obj/item/frame) && anchored)
 		var/obj/item/frame/F = W
-		F.try_build(src)
+		F.try_build(src, user)
 	else
 		user.setClickCooldown(user.get_attack_speed(W))
 		if(W.damtype == BRUTE || W.damtype == BURN)