deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

..

computer_components.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

computer_damage.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

computer_power.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

computer_ui.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

computer.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

laptop_presets.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

laptop.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

processor.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

tablet_presets.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

tablet.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00