Sync with master (#3)

Alot of stuff, honk
This commit is contained in:
DeltaFire15
2019-11-16 16:03:25 +01:00
committed by GitHub
parent 3d8c41e143
commit 350dd6ed3a
1635 changed files with 40068 additions and 142864 deletions
@@ -157,6 +157,21 @@
return card_slot.GetID()
return ..()
/obj/item/modular_computer/RemoveID()
var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
if(!card_slot)
return
return card_slot.RemoveID()
/obj/item/modular_computer/InsertID(obj/item/inserting_item)
var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
if(!card_slot)
return FALSE
var/obj/item/card/inserting_id = inserting_item.RemoveID()
if(!inserting_id)
return FALSE
return card_slot.try_insert(inserting_id)
/obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location)
var/mob/M = usr
if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src))
@@ -17,8 +17,7 @@
machinery_computer = null
/obj/item/modular_computer/processor/New(comp)
STOP_PROCESSING(SSobj, src) // Processed by its machine
. = ..()
if(!comp || !istype(comp, /obj/machinery/modular_computer))
CRASH("Inapropriate type passed to obj/item/modular_computer/processor/New()! Aborting.")
return