cib d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature ...

Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm

2012-12-16 15:10:04 +01:00

..

admin

Fix to the improved player notes list.

2012-12-09 21:00:36 +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

made space ninja a toggleable client option

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

clothing

Merge pull request #2027 from SweeperM/master

2012-12-03 03:09:02 -08:00

critters

…

customitems

Four custom items plus config.txt.

2012-12-16 00:40:04 -08: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 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

2012-12-16 15:10:04 +01:00

paperwork

Roboitems - Printing Pen

2012-11-28 03:03:20 -08:00

power

Portable generator Fix

2012-12-12 02:49:29 -08:00

projectiles

Merge branch 'features' into work_in_progress

2012-12-11 12:39:22 +10:00

reagents

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

2012-12-16 15:10:04 +01: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

…