PsiOmegaDelta cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

computers

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

bios.dm

Fixes an infinite loop issue

2015-06-30 06:26:51 +01:00

buildandrepair.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

component.dm

…

computer3_notes.dm

…

computer.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

file.dm

…

laptop.dm

Fixes #6029

2015-06-02 14:27:16 +03:00

lapvend.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

networking.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

NTOS.dm

…

program_disks.dm

Adds a floppy disk which provides access to the station camera network given appropriate hardware.

2015-02-12 12:20:58 +01:00

program.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

server.dm

…

storage.dm

…