From 3e1555c4f8c62fdbf95ae0ef0c5b759e51c8dc24 Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 19 May 2019 17:23:08 -0400 Subject: [PATCH] Merge pull request #6167 from Heroman3003/laptop-bugfixes Fixes some bugs with laptop --- .../modular_computers/computers/subtypes/dev_laptop.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index ac284b6bac..851008b23d 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -16,7 +16,10 @@ w_class = ITEMSIZE_NORMAL var/icon_state_closed = "laptop-closed" -/obj/item/modular_computer/laptop/AltClick() +/obj/item/modular_computer/laptop/AltClick(mob/living/carbon/user) + // We need to be close to it to open it + if((!in_range(src, user)) || user.stat || user.restrained()) + return // Prevents carrying of open laptops inhand. // While they work inhand, i feel it'd make tablets lose some of their high-mobility advantage they have over laptops now. if(!istype(loc, /turf/)) @@ -41,7 +44,9 @@ ..() else overlays.Cut() + set_light(0) // No glow from closed laptops icon_state = icon_state_closed /obj/item/modular_computer/laptop/preset anchored = FALSE + screen_on = FALSE