Merge branch 'master' into modular_computer_enhancement

This commit is contained in:
Geeves
2020-04-22 01:08:14 +02:00
committed by GitHub
109 changed files with 1388 additions and 847 deletions

View File

@@ -208,4 +208,8 @@
if(use_check_and_message(M))
return
if(!istype(over_object, /obj/screen) && !(over_object == src))
return attack_self(M)
return attack_self(M)
/obj/item/modular_computer/GetID()
if(card_slot.stored_card)
return card_slot.stored_card