Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-15-10-2025

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

@@ -29,6 +29,7 @@
 	if(start_open && !screen_on)
 		toggle_open()
 	RegisterSignal(src, COMSIG_SPEED_POTION_APPLIED, PROC_REF(on_speed_potioned))
+	AddElement(/datum/element/drag_pickup)
 
 /obj/item/modular_computer/laptop/examine(mob/user)
 	. = ..()
@@ -76,16 +77,6 @@
 
 	try_toggle_open(usr)
 
-/obj/item/modular_computer/laptop/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
-	if(over_object == user || over_object == src)
-		try_toggle_open(user)
-		return
-	if(istype(over_object, /atom/movable/screen/inventory/hand))
-		var/atom/movable/screen/inventory/hand/H = over_object
-		if(!isturf(loc))
-			return
-		user.put_in_hand(src, H.held_index)
-
 /obj/item/modular_computer/laptop/proc/try_toggle_open(mob/living/user)
 	if(issilicon(user))
 		return

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

@@ -201,7 +201,7 @@
 // "Stun" weapons can cause minor damage to components (short-circuits?)
 // "Burn" damage is equally strong against internal components and exterior casing
 // "Brute" damage mostly damages the casing.
-/obj/machinery/modular_computer/bullet_act(obj/projectile/proj)
-	return cpu?.projectile_hit(proj) || ..()
+/obj/machinery/modular_computer/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked)
+	return cpu?.projectile_hit(hitting_projectile, def_zone, piercing_hit, blocked) || ..()
 
 #undef CPU_INTERACTABLE