diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 034063c4532..4f45423f6e2 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -27,13 +27,14 @@
 	var/window_type = /obj/structure/window/reinforced/full
 	var/material_to_use = DEFAULT_WALL_MATERIAL // So badmins can make RCDs that print diamond walls.
 	var/make_rwalls = FALSE // If true, when building walls, they will be reinforced.
-
+/* VOREStation Removal - Unused
 /obj/item/weapon/rcd/Initialize()
+	
 	src.spark_system = new /datum/effect/effect/system/spark_spread
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 	return ..()
-
+*/
 /obj/item/weapon/rcd/Destroy()
 	QDEL_NULL(spark_system)
 	spark_system = null
@@ -48,6 +49,7 @@
 	return "It currently holds [stored_matter]/[max_stored_matter] matter-units."
 
 // Used to add new cartridges.
+/* VOREStation Tweak - Wow this is annoying, moved to _vr file for overhaul
 /obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user)
 	if(istype(W, /obj/item/weapon/rcd_ammo))
 		var/obj/item/weapon/rcd_ammo/cartridge = W
@@ -61,9 +63,10 @@
 		to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
 		return TRUE
 	return ..()
-
+*/
 // Changes which mode it is on.
 /obj/item/weapon/rcd/attack_self(mob/living/user)
+/* VOREStation Removal - Moved to VR
 	if(mode_index >= modes.len) // Shouldn't overflow unless someone messes with it in VV poorly but better safe than sorry.
 		mode_index = 1
 	else
@@ -74,7 +77,7 @@
 
 	if(prob(20))
 		src.spark_system.start()
-
+*/
 // Removes resources if the RCD can afford it.
 /obj/item/weapon/rcd/proc/consume_resources(amount)
 	if(!can_afford(amount))
@@ -118,6 +121,7 @@
 		rcd_beam = beam_origin.Beam(A, icon_state = "rped_upgrade", time = max(true_delay, 5))
 	busy = TRUE
 
+	perform_effect(A, true_delay) //VOREStation Add
 	if(do_after(user, true_delay, target = A))
 		busy = FALSE
 		// Doing another check in case we lost matter during the delay for whatever reason.
diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm
new file mode 100644
index 00000000000..2369ca0d936
--- /dev/null
+++ b/code/game/objects/items/weapons/RCD_vr.dm
@@ -0,0 +1,218 @@
+/obj/item/weapon/rcd
+	icon = 'icons/obj/tools_vr.dmi'
+	icon_state = "rcd"
+	item_state = "rcd"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi',
+	)
+	var/ammostate
+	var/list/effects = list()
+
+	var/static/image/radial_image_airlock = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"),
+	var/static/image/radial_image_decon = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"),
+	var/static/image/radial_image_grillewind = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"),
+	var/static/image/radial_image_floorwall = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
+
+// Ammo for the (non-electric) RCDs.
+/obj/item/weapon/rcd_ammo
+	name = "compressed matter cartridge"
+	desc = "Highly compressed matter for the RCD."
+	icon = 'icons/obj/tools_vr.dmi'
+	icon_state = "rcdammo"
+	item_state = "rcdammo"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi',
+	)
+
+/obj/item/weapon/rcd/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/weapon/rcd/consume_resources(amount)
+	. = ..()
+	update_icon()
+
+/obj/item/weapon/rcd/update_icon()
+	var/nearest_ten = round((stored_matter/max_stored_matter)*10, 1)
+	
+	//Just to prevent updates every use
+	if(ammostate == nearest_ten)
+		return //No change
+	ammostate = nearest_ten
+	
+	cut_overlays()
+	
+	//Main sprite update
+	if(!nearest_ten)
+		icon_state = "[initial(icon_state)]_empty"
+	else
+		icon_state = "[initial(icon_state)]"
+	
+	add_overlay("[initial(icon_state)]_charge[nearest_ten]")
+
+/obj/item/weapon/rcd/proc/perform_effect(var/atom/A, var/time_taken)
+	effects[A] = new /obj/effect/constructing_effect(get_turf(A), time_taken, modes[mode_index])
+
+/obj/item/weapon/rcd/use_rcd(atom/A, mob/living/user)
+	. = ..()
+	cleanup_effect(A)
+
+/obj/item/weapon/rcd/proc/cleanup_effect(var/atom/A)
+	if(A in effects)
+		qdel(effects[A])
+		effects -= A
+
+/obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user)
+	if(istype(W, /obj/item/weapon/rcd_ammo))
+		var/obj/item/weapon/rcd_ammo/cartridge = W
+		var/can_store = min(max_stored_matter - stored_matter, cartridge.remaining)
+		if(can_store <= 0)
+			to_chat(user, span("warning", "There's either no space or \the [cartridge] is empty!"))
+			return FALSE
+		stored_matter += can_store
+		cartridge.remaining -= can_store
+		if(!cartridge.remaining)
+			to_chat(user, span("warning", "\The [cartridge] dissolves as it empties of compressed matter."))
+			user.drop_from_inventory(W)
+			qdel(W)
+		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+		to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
+		update_icon()
+		return TRUE
+	return ..()
+
+/obj/item/weapon/rcd/proc/check_menu(mob/living/user)
+	if(!istype(user))
+		return FALSE
+	if(user.incapacitated() || !user.Adjacent(src))
+		return FALSE
+	return TRUE
+
+/obj/item/weapon/rcd/attack_self(mob/living/user)
+	..()
+	var/list/choices = list(
+		"Airlock" = radial_image_airlock,
+		"Deconstruct" = radial_image_decon,
+		"Grilles & Windows" = radial_image_grillewind,
+		"Floors & Walls" = radial_image_floorwall
+	)
+	/* We don't have these features yet
+	if(upgrade & RCD_UPGRADE_FRAMES)
+		choices += list(
+		"Machine Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "machine"),
+		"Computer Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "computer_dir"),
+		)
+	if(upgrade & RCD_UPGRADE_SILO_LINK)
+		choices += list(
+		"Silo Link" = image(icon = 'icons/obj/mining.dmi', icon_state = "silo"),
+		)
+	if(mode == RCD_AIRLOCK)
+		choices += list(
+		"Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"),
+		"Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype")
+		)
+	else if(mode == RCD_WINDOWGRILLE)
+		choices += list(
+			"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
+		)
+	*/
+	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+	if(!check_menu(user))
+		return
+	switch(choice)
+		if("Floors & Walls")
+			mode_index = modes.Find(RCD_FLOORWALL)
+		if("Airlock")
+			mode_index = modes.Find(RCD_AIRLOCK)
+		if("Deconstruct")
+			mode_index = modes.Find(RCD_DECONSTRUCT)
+		if("Grilles & Windows")
+			mode_index = modes.Find(RCD_WINDOWGRILLE)
+		/* We don't have these features yet
+		if("Machine Frames")
+			mode = RCD_MACHINE
+		if("Computer Frames")
+			mode = RCD_COMPUTER
+			change_computer_dir(user)
+			return
+		if("Change Access")
+			change_airlock_access(user)
+			return
+		if("Change Airlock Type")
+			change_airlock_setting(user)
+			return
+		if("Change Window Type")
+			toggle_window_type(user)
+			return
+		if("Silo Link")
+			toggle_silo_link(user)
+			return
+		*/
+		else
+			return
+	playsound(src, 'sound/effects/pop.ogg', 50, FALSE)
+	to_chat(user, "<span class='notice'>You change RCD's mode to '[choice]'.</span>")
+
+//////////////////
+/obj/item/weapon/rcd/electric/update_icon()
+	return
+
+/obj/item/weapon/rcd/shipwright
+	icon_state = "swrcd"
+	item_state = "ircd"
+	can_remove_rwalls = TRUE
+	make_rwalls = TRUE
+
+//////////////////
+/obj/item/weapon/rcd_ammo/examine(mob/user)
+	..()
+	to_chat(user, display_resources())
+
+// Used to show how much stuff (matter units, cell charge, etc) is left inside.
+/obj/item/weapon/rcd_ammo/proc/display_resources()
+	return "It currently holds [remaining]/[initial(remaining)] matter-units."
+
+//////////////////
+/obj/effect/constructing_effect
+	icon = 'icons/effects/effects_rcd.dmi'
+	icon_state = ""
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+	anchored = TRUE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	var/status = 0
+	var/delay = 0
+
+/obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status)
+	. = ..()
+	status = rcd_status
+	delay = rcd_delay
+	if (status == RCD_DECONSTRUCT)
+		addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
+		delay -= 11
+		icon_state = "rcd_end_reverse"
+	else
+		update_icon()
+
+/obj/effect/constructing_effect/update_icon()
+	icon_state = "rcd"
+	if (delay < 10)
+		icon_state += "_shortest"
+	else if (delay < 20)
+		icon_state += "_shorter"
+	else if (delay < 37)
+		icon_state += "_short"
+	if (status == RCD_DECONSTRUCT)
+		icon_state += "_reverse"
+
+/obj/effect/constructing_effect/proc/end_animation()
+	if (status == RCD_DECONSTRUCT)
+		qdel(src)
+	else
+		icon_state = "rcd_end"
+		addtimer(CALLBACK(src, .proc/end), 15)
+
+/obj/effect/constructing_effect/proc/end()
+	qdel(src)
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 260a01b04de..7af320d69fc 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -8,8 +8,8 @@ RSF
 	name = "\improper Rapid-Service-Fabricator"
 	desc = "A device used to rapidly deploy service items."
 	description_info = "Control Clicking on the device will allow you to choose the glass it dispenses when in the proper mode."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "rcd"
+	icon = 'icons/obj/tools_vr.dmi' //VOREStation Edit
+	icon_state = "rsf" //VOREStation Edit
 	opacity = 0
 	density = 0
 	anchored = 0.0
diff --git a/icons/effects/effects_rcd.dmi b/icons/effects/effects_rcd.dmi
new file mode 100644
index 00000000000..efb13bfb11a
Binary files /dev/null and b/icons/effects/effects_rcd.dmi differ
diff --git a/icons/mob/items/lefthand_vr.dmi b/icons/mob/items/lefthand_vr.dmi
index 009e5585328..c419b6f0750 100644
Binary files a/icons/mob/items/lefthand_vr.dmi and b/icons/mob/items/lefthand_vr.dmi differ
diff --git a/icons/mob/items/righthand_vr.dmi b/icons/mob/items/righthand_vr.dmi
index c9a7af5fb87..53abebcd3f1 100644
Binary files a/icons/mob/items/righthand_vr.dmi and b/icons/mob/items/righthand_vr.dmi differ
diff --git a/icons/obj/tools_vr.dmi b/icons/obj/tools_vr.dmi
index 72316467dd6..b6fb6487c73 100644
Binary files a/icons/obj/tools_vr.dmi and b/icons/obj/tools_vr.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index 16d776ef7a5..a453552ef09 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1174,6 +1174,7 @@
 #include "code\game\objects\items\weapons\paiwire.dm"
 #include "code\game\objects\items\weapons\policetape.dm"
 #include "code\game\objects\items\weapons\RCD.dm"
+#include "code\game\objects\items\weapons\RCD_vr.dm"
 #include "code\game\objects\items\weapons\RSF.dm"
 #include "code\game\objects\items\weapons\scrolls.dm"
 #include "code\game\objects\items\weapons\shields.dm"