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

..

admin

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Merge branch 'dev' into ofResearchAndPrototypes

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

awaymissions

…

client

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

clothing

Merge branch 'dev' into ofResearchAndPrototypes

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

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +09:30

detectivework

…

economy

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

2015-05-09 11:13:05 +02:00

events

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

2015-05-12 13:40:47 +02:00

examine

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Merge branch 'dev' into ofResearchAndPrototypes

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

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

fix an issue with destroying light sources that have 0 light_range

2015-05-14 10:58:52 +01:00

liquid

…

maps

…

materials

Bit of documentation.

2015-05-20 14:00:14 +09:30

mining

Merge branch 'dev' into ofResearchAndPrototypes

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

mob

Merge branch 'dev' into ofResearchAndPrototypes

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

nano

better nanoui caching + fixes

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

organs

Ghetto diagnostics!

2015-05-18 06:37:51 +03:00

overmap

…

paperwork

Merge branch 'dev' into ofResearchAndPrototypes

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

power

Merge branch 'dev' into ofResearchAndPrototypes

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

projectiles

Merge branch 'dev' into ofResearchAndPrototypes

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

random_map

…

reagents

Merge branch 'dev' into ofResearchAndPrototypes

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

recycling

Made sorting pipes dispesible

2015-05-16 17:27:39 +03:00

research

Merge branch 'dev' into ofResearchAndPrototypes

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

scripting

…

security levels

…

shieldgen

new object-based lighting system

2015-05-10 20:54:25 +01:00

shuttles

…

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

new object-based lighting system

2015-05-10 20:54:25 +01:00

surgery

Merge with dev.

2015-05-20 13:39:31 +09:30

tables

Merge with dev.

2015-05-20 13:39:31 +09:30

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

…