Merge remote-tracking branch 'upstream/master' into rebase-to-vg

code/modules/modular_computers/computers/item/computer_components.dm

@@ -17,13 +17,12 @@
 	if(!can_install_component(H, user))
 		return FALSE
 
-	if(user && !user.unEquip(H))
+	if(user && !user.transferItemToLoc(H, src))
 		return FALSE
 
 	all_components[H.device_type] = H
 
 	user << "<span class='notice'>You install \the [H] into \the [src].</span>"
-	H.forceMove(src)
 	H.holder = src
 	H.on_install(src, user)
 

code/modules/modular_computers/computers/machinery/modular_computer.dm

@@ -141,6 +141,7 @@ var/list/global_modular_computers = list()
 /obj/machinery/modular_computer/ex_act(severity)
 	if(cpu)
 		cpu.ex_act(severity)
+	..()
 
 // EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components
 /obj/machinery/modular_computer/emp_act(severity)