Merge remote-tracking branch 'upstream/dev-freeze' into dev

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

@@ -59,7 +59,7 @@
 	if(!proximity) return
 	if(disabled && !isrobot(user))
 		return 0
-	if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
+	if(istype(get_area(A),/area/shuttle)||istype(get_area(A),/turf/space/transit))
 		return 0
 	return alter_turf(A,user,(mode == 3))
 

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

@@ -45,6 +45,7 @@
 	W.forceMove(src)
 	icon_state = W.icon_state + "_taped"
 	name = W.name + " (taped)"
+	overlays = W.overlays
 
 /obj/item/weapon/ducttape/attack_self(mob/user as mob)
 	if(!stuck)
@@ -56,6 +57,7 @@
 	stuck.forceMove(get_turf(src))
 	user.put_in_hands(stuck)
 	stuck = null
+	overlays = null
 	del(src)
 
 /obj/item/weapon/ducttape/afterattack(var/A, mob/user as mob, flag, params)