Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm

2015-05-22 19:26:39 +03:00

..

PDA

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

radio

Merge branch 'dev' into ofResearchAndPrototypes

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

aicard.dm

Updates to science

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

binoculars.dm

Removes FPRINT and TABLEPASS flags

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

chameleonproj.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

debugger.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

flash.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

flashlight.dm

Makes update_action_buttons() work on-demand

2015-05-20 01:28:16 -04:00

floor_painter.dm

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

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

lightreplacer.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

megaphone.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

modkit.dm

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

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

multitool.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

paicard.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

pipe_painter.dm

…

powersink.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

scanners.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

spy_bug.dm

Updates to science

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

suit_cooling.dm

Updates to science

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

taperecorder.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

traitordevices.dm

Updates to science

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

transfer_valve.dm

…

uplinks.dm

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

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

violin.dm

…

whistle.dm

Allows hailer messages to be altered.

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