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

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

@@ -24,6 +24,7 @@
 
 	user << "<span class='notice'>You install \the [H] into \the [src].</span>"
 	H.holder = src
+	H.forceMove(src)
 	H.on_install(src, user)
 
 

code/modules/modular_computers/hardware/card_slot.dm

@@ -68,14 +68,18 @@
 
 	var/ejected = 0
 	if(stored_card && (!slot || slot == 1))
-		stored_card.forceMove(get_turf(src))
-		stored_card.verb_pickup()
+		if(user)
+			user.put_in_hands(stored_card)
+		else
+			stored_card.forceMove(get_turf(src))
 		stored_card = null
 		ejected++
 
 	if(stored_card2 && (!slot || slot == 2))
-		stored_card2.forceMove(get_turf(src))
-		stored_card2.verb_pickup()
+		if(user)
+			user.put_in_hands(stored_card2)
+		else
+			stored_card2.forceMove(get_turf(src))
 		stored_card2 = null
 		ejected++
 

code/modules/modular_computers/hardware/recharger.dm

@@ -39,11 +39,11 @@
 
 	else
 		var/area/A = get_area(src)
-		if(!A || !isarea(A) || !A.master)
+		if(!istype(A))
 			return 0
 
-		if(A.master.powered(EQUIP))
-			A.master.use_power(amount, EQUIP)
+		if(A.powered(EQUIP))
+			A.use_power(amount, EQUIP)
 			return 1
 	return 0