cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm
This commit is contained in:
skull132
2018-08-05 20:29:03 +03:00
parent f1dd7d562d 1635533d57
commit b6e8ae4d53
43 changed files with 207 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/subtypes/dev_laptop.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/icon_state_closed = "laptop-closed"
/obj/item/modular_computer/laptop/AltClick()
if (!use_check(usr, show_messages = FALSE)) return
if (use_check(usr, show_messages = FALSE)) 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/))