Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +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

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

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

camera.dm

computer3 remote view exploit fix

2014-07-31 09:34:58 +02: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

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

2014-09-10 22:14:37 +01:00

crew.dm

should fix #6030

2014-08-17 18:18:07 +02: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

One can now update crew record photos using a security console.

2014-08-22 19:39:35 +02: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

prisoner computer3 topic exploit fixes

2014-07-31 09:28:47 +02: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

laptop vending part 1. and more cleanup.

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

scanconsole.dm

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

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

security.dm

One can now update crew record photos using a security console.

2014-08-22 19:39:35 +02: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