Couls fb619648a9 Resolve conflicts

2019-05-03 22:28:04 -04:00

..

_hardware.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

ai_slot.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

battery_module.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

card_slot.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

CPU.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

hard_drive.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

network_card.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

portable_disk.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

printer.dm

Paving the path for a bigger inventory refactor

2018-09-23 22:26:10 +08:00

recharger.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00