PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm

2015-06-16 10:52:33 +02:00

..

PDA

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

2015-06-16 10:52:33 +02:00

radio

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

aicard.dm

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

2015-06-07 10:51:41 +02:00

binoculars.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

chameleonproj.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

debugger.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

flash.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

flashlight.dm

Thefication

2015-06-16 02:50:25 +03:00

floor_painter.dm

Fixes floor painter 'side/3 corners'->'black' and another state

2015-05-21 06:03:15 +01:00

lightreplacer.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

megaphone.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

modkit.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

multitool.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

paicard.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

pipe_painter.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

powersink.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

scanners.dm

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

2015-06-16 10:30:50 +02:00

spy_bug.dm

Updates to science

2015-04-04 13:38:03 +03:00

suit_cooling.dm

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

2015-05-30 16:11:57 +02:00

taperecorder.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

traitordevices.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

transfer_valve.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

uplinks.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

violin.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

whistle.dm

Allows hailer messages to be altered.

2015-05-12 16:42:43 +09:30