Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

2019-09-28 00:16:11 -04:00

..

_hardware.dm

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-28 00:16:11 -04:00

ai_slot.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

battery_module.dm

rechargers now show their contents and charge status on examine

2019-05-18 19:56:30 +02:00

card_slot.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

CPU.dm

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

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

hard_drive.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07: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

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

recharger.dm

Powernet Refactor

2019-04-27 02:06:04 -04:00