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

..

computers

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

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

upload

lowercase ntos by request of mloc + updates to background.

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

bios.dm

…

buildandrepair.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

component.dm

Fixes #5569, Fixes #5571

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

computer3_notes.dm

lowercase ntos by request of mloc + updates to background.

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

computer.dm

Adds battery status icon to NTOS

2014-07-20 15:15:29 +02:00

file.dm

Fixes #5553

2014-07-17 19:03:31 +02:00

laptop.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

lapvend.dm

Merge branch 'laptop-multifix' of https://github.com/atlantiscze/Baystation12 into laptop-multifix

2014-07-20 01:55:42 +02:00

networking.dm

…

NTOS.dm

computer3 ntos topic exploit prevention

2014-07-31 09:48:17 +02:00

program_disks.dm

…

program.dm

computer3 program topic protection

2014-07-31 09:42:26 +02:00

server.dm

…

storage.dm

…

test_machines.dm

…