Chinsky 5a62904fe1 Merge branch 'master' into surgery ...

Conflicts:
	code/datums/organs/organ_external.dm

2012-11-22 15:18:42 +04: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

made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations

2012-10-27 19:59:05 +10:00

chemical

…

client

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +10:00

clothing

Adds a /The to the holstering and drawing a firearm messages, for when the name of the user is improper or not capitalized.

2012-11-18 16:47:52 -07:00

critters

various mergefixes

2012-10-09 22:49:38 +10:00

customitems

Added Smash Recipe Custom Item

2012-11-13 19:56:52 -05:00

DetectiveWork

Some fixes to Detective Work.

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

flufftext

…

food

Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

2012-10-15 23:17:18 +10:00

genetics

Replaced monkey with confusion effect.

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

icon generation

…

library

…

liquid

…

maps

…

mining

Fixed my ore box mistakes

2012-10-25 08:48:25 -07:00

mob

Merge branch 'master' into surgery

2012-11-22 15:18:42 +04: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

Fixes issue #1971

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

recycling

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

research

Nullchecks. And one zero division.

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

scripting

…

security levels

…