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

..

ai_core.dm

Major sheet and material refactor.

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

aifixer.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

arcade.dm

Merge pull request #8289 from MrSnapwalk/actionfigurefix

2015-02-26 16:26:37 +10:30

atmos_alert.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

atmos_control.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

buildandrepair.dm

Major sheet and material refactor.

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

camera_circuit.dm

…

camera.dm

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

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

card.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

cloning.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

communications.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

computer.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

crew.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

guestpass.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

law.dm

Updated OldUI for Computers to be usable by ghosts

2015-01-01 18:15:47 +00:00

lockdown.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

medical.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

message.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

Operating.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

pod.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

prisoner.dm

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

2015-06-22 16:41:50 +02:00

prisonshuttle.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

RCON_Console.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

robot.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

security.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

shuttle.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

skills.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

specops_shuttle.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

station_alert.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

supply.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

syndicate_specops_shuttle.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00