PsiOmega eca4265abe Merge remote-tracking branch 'upstream/dev' into CanTrack ...

Conflicts:
	code/game/machinery/camera/tracking.dm

2015-02-02 08:15:41 +01:00

..

aifixer.dm

lowercase ntos by request of mloc + updates to background.

2014-06-22 03:46:36 -07:00

arcade.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

atmos_alert.dm

Fixes atmos alert consoles for #5460

2014-12-23 14:00:02 +10:30

camera.dm

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

2015-02-02 08:15:41 +01:00

card.dm

Fixes #5569, Fixes #5571

2014-07-18 00:47:39 +02:00

cloning.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

communications.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

crew.dm

Fixes laptop crew monitor program not showing assignment

2015-01-14 15:58:09 +00:00

customs.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

HolodeckControl.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

law.dm

part 3 of fixing #5521

2014-07-10 17:04:27 +02:00

medical.dm

Fix for #7204.

2014-12-06 18:08:12 +03:00

message.dm

laptop vending part 1. and more cleanup.

2014-06-22 17:19:40 -07:00

Operating.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

power.dm

laptop vending part 1. and more cleanup.

2014-06-22 17:19:40 -07:00

prisoner.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

prisonshuttle.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

robot.dm

Cyborg detonation notice

2014-11-03 19:40:24 +01:00

scanconsole.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

security.dm

Fix for #7204.

2014-12-06 18:08:12 +03:00

shuttle.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

specops_shuttle.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

station_alert.dm

laptop vending part 1. and more cleanup.

2014-06-22 17:19:40 -07:00

syndicate_shuttle.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

syndicate_specops_shuttle.dm

Initial commit of Computer 3 from Paradise, along with a bunch of fixes.

2014-06-22 02:08:42 -07:00

welcome.dm

Forgot to commit welcome.dm

2014-06-23 01:54:03 -07:00