GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm

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

..

alarm_monitor.dm

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

2015-07-14 08:21:12 +02:00

atmos_control.dm

Compilation fixes.

2015-07-17 23:21:59 +02:00

crew_monitor.dm

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

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

human_appearance.dm

Fixes antags being able to see the appearance changer.

2015-06-21 21:12:28 +02:00

law_manager.dm

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

2015-07-26 10:21:36 +02:00

nano_module.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

power_monitor.dm

Power monitor UI now attempts to get the turf of its host.

2015-06-09 16:24:47 +02:00

rcon.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00