Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm

2015-05-21 17:00:50 +03:00

..

admin

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

alarm

more lightweight camera caching

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

assembly

Changed steel material name to a define.

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

awaymissions

…

client

Dev merge.

2015-05-12 23:33:29 +09:30

clothing

Merge pull request #9369 from mwerezak/action-icons

2015-05-21 03:35:41 +03:00

customitems

Allowed accessories to function as custom items using icon_override

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

detectivework

…

economy

…

events

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

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

examine

…

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 ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

icon generation

…

library

…

lighting

fix an issue with destroying light sources that have 0 light_range

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

liquid

…

maps

…

materials

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

2015-05-16 08:53:33 +01:00

mining

qdel

2015-05-12 13:12:58 +09:30

mob

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +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 ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

power

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

2015-05-14 22:20:58 +02:00

projectiles

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

random_map

…

reagents

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

recycling

Made sorting pipes dispesible

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

research

Merge pull request #9165 from Yoshax/trapping

2015-05-19 01:43:05 +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

Fixes cavity surgery using old organ names

2015-05-18 06:15:09 +03:00

tables

Fixes #9341

2015-05-18 07:10:37 +01:00

vehicles

new object-based lighting system

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

virus2

…