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

..

drone

Fixes drone runtime.

2015-06-28 19:02:23 +02:00

analyzer.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

component.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

death.dm

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

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

emote.dm

…

examine.dm

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

2015-06-16 10:30:50 +02:00

inventory.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

laws.dm

Moves silicon law logging to a more all-catching location.

2015-03-22 14:11:44 +01:00

life.dm

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

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

login.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

photos.dm

Fixes #7366.

2014-12-10 21:54:57 +01:00

robot_damage.dm

EMP deals burn instead of brute to silicons, and bypasses robot armour

2015-03-23 02:47:05 -04:00

robot_items.dm

Merge with dev.

2015-05-20 13:39:31 +09:30

robot_modules.dm

Fixes drone runtime.

2015-06-28 19:02:23 +02:00

robot_movement.dm

Cleans up borg module code and responsibilities.

2015-04-26 12:00:30 +02:00

robot.dm

Fixes drone runtime.

2015-06-28 19:02:23 +02:00