Ian Turk 1b7ca8c0e5 Resolved merge conflicts

2017-08-16 08:33:24 -06:00

..

computer_components.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

computer_damage.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

computer_power.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

computer_ui.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

computer.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

laptop_presets.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

laptop.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-15 16:01:35 -06:00

processor.dm

…

tablet_presets.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

tablet.dm

Tablet resprite (#29427)

2017-07-22 20:53:49 +02:00