Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work

2026-07-16 10:35:41 +01:00 · 2016-09-10 20:28:23 +01:00
parent f145a05f49 424be04026
commit c50fa5729c
216 changed files with 4331 additions and 1228 deletions
@@ -148,6 +148,9 @@
 		return attack_self(M)
 	return

+/obj/item/device/modular_computer/attack_ai(mob/user)
+	return attack_self(user)
+
 /obj/item/device/modular_computer/attack_ghost(mob/dead/observer/user)
 	if(enabled)
 		ui_interact(user)