PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-08-24 10:31:30 +02:00

..

drone

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

2015-08-24 10:31:30 +02:00

analyzer.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

component.dm

…

custom_sprites.dm

Renames definition and compilation fix.

2015-08-10 18:00:50 +02:00

death.dm

…

emote.dm

Compile fix

2015-08-11 18:47:25 +01:00

examine.dm

…

inventory.dm

…

laws.dm

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

life.dm

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

2015-08-10 17:56:14 +02:00

login.dm

Synth access and icon update changes.

2015-08-20 12:40:08 +02:00

photos.dm

…

robot_damage.dm

…

robot_items.dm

Synths now relies on access permissions as well.

2015-08-17 09:12:40 +02:00

robot_modules.dm

Id card handling changes.

2015-08-21 14:04:06 +02:00

robot_movement.dm

…

robot.dm

Synth access and icon update changes.

2015-08-20 12:40:08 +02:00

syndicate.dm

Makes it possible for syndicate borgs to copy access from other ids.

2015-08-20 13:49:53 +02:00