Cael_Aislinn 6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress ...

Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-12-03 13:08:47 +10:00

..

admin

Nullchecks. And one zero division.

2012-11-21 20:55:53 +04:00

assembly

Fixes issue #1889

2012-11-15 23:39:28 +04:00

awaymissions

…

chemical

…

client

made space ninja a toggleable client option

2012-12-01 18:07:18 +10:00

clothing

Fixed compile error in custom items.

2012-12-01 18:35:27 +04:00

critters

…

customitems

Fixed compile error in custom items.

2012-12-01 18:35:27 +04:00

DetectiveWork

Some fixes to Detective Work.

2012-11-11 14:46:37 -07:00

flufftext

…

food

…

genetics

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01:00

icon generation

…

library

…

liquid

…

maps

…

mining

…

mob

fixed an extra line added

2012-12-03 01:04:14 +10:00

paperwork

Nullchecks. And one zero division.

2012-11-21 20:55:53 +04:00

power

Nullchecks. And one zero division.

2012-11-21 20:55:53 +04:00

projectiles

Fixes issue #1971

2012-11-18 11:24:17 +04:00

reagents

CPR optimisations, made hypospray visible on the map

2012-12-01 18:06:19 +10:00

recycling

Merge pull request #2012 from comma/master

2012-11-26 08:59:20 -08:00

research

Nullchecks. And one zero division.

2012-11-21 20:55:53 +04:00

scripting

…

security levels

…