jack-fractal 2754b56e0c adding the spirit entity code, fixing the cameraNet so that it compiles properly ...

Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm

2014-05-15 05:06:38 -04:00

..

aifixer.dm

computer3 merge

2013-11-03 14:18:54 -05:00

arcade.dm

computer3 merge

2013-11-03 14:18:54 -05:00

atmos_alert.dm

computer3 merge

2013-11-03 14:18:54 -05:00

camera.dm

adding the spirit entity code, fixing the cameraNet so that it compiles properly

2014-05-15 05:06:38 -04:00

card.dm

computer3 merge

2013-11-03 14:18:54 -05:00

cloning.dm

computer3 merge

2013-11-03 14:18:54 -05:00

communications.dm

Emergency Message Cooldown

2014-04-15 00:29:29 +09:30

crew.dm

computer3 merge

2013-11-03 14:18:54 -05:00

customs.dm

Added 5 new types of random events

2013-11-05 08:08:01 -05:00

HolodeckControl.dm

computer3 merge

2013-11-03 14:18:54 -05:00

law.dm

computer3 merge

2013-11-03 14:18:54 -05:00

medical.dm

computer3 merge

2013-11-03 14:18:54 -05:00

message.dm

computer3 merge

2013-11-03 14:18:54 -05:00

Operating.dm

computer3 merge

2013-11-03 14:18:54 -05:00

pod.dm

computer3 merge

2013-11-03 14:18:54 -05:00

power.dm

computer3 merge

2013-11-03 14:18:54 -05:00

prisoner.dm

computer3 merge

2013-11-03 14:18:54 -05:00

prisonshuttle.dm

computer3 merge

2013-11-03 14:18:54 -05:00

robot.dm

computer3 merge

2013-11-03 14:18:54 -05:00

scanconsole.dm

computer3 merge

2013-11-03 14:18:54 -05:00

security.dm

computer3 merge

2013-11-03 14:18:54 -05:00

shuttle.dm

computer3 merge

2013-11-03 14:18:54 -05:00

specops_shuttle.dm

computer3 merge

2013-11-03 14:18:54 -05:00

station_alert.dm

computer3 merge

2013-11-03 14:18:54 -05:00

syndicate_shuttle.dm

computer3 merge

2013-11-03 14:18:54 -05:00

syndicate_specops_shuttle.dm

computer3 merge

2013-11-03 14:18:54 -05:00