cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into TGUI-4

Browse Source
This commit is contained in:
Letter N
2020-08-09 14:54:16 +08:00
parent 2615506ae9 f545434f65
commit f1c4a7f6ac
84 changed files with 1643 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/modular_computers/computers/item/laptop.dm
View File

@@ -72,7 +72,8 @@
return
M.put_in_hand(src, H.held_index)
/obj/item/modular_computer/laptop/on_attack_hand(mob/user)
/obj/item/modular_computer/laptop/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(screen_on && isturf(loc))
return attack_self(user)