Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

admin

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

2014-05-11 13:19:09 +00:00

assembly

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

awaymissions

…

client

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

2014-05-08 19:27:02 +01:00

clothing

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

2014-05-11 13:19:09 +00:00

customitems

Initial commit for Kaine's custom items.

2014-04-25 19:13:51 -06:00

destilery

…

detectivework

Updates the Screen even when usr is using another console

2014-05-06 04:54:06 +02:00

economy

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet

2014-04-21 06:07:02 +01:00

events

Replaces the now non-existing "unused assembly line" with another area.

2014-05-01 13:33:58 +02:00

ext_scripts

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-04-16 23:14:17 -05:00

flufftext

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

food

…

genetics

…

icon generation

…

library

Targeting eyes with book/paper shows book/paper

2014-05-03 19:56:55 +03:00

liquid

…

maps

…

mining

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

2014-05-11 13:19:09 +00:00

mob

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

2014-05-11 13:19:09 +00:00

nano

…

organs

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

2014-05-05 22:22:01 +01:00

paperwork

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

2014-05-11 13:19:09 +00:00

power

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

2014-05-11 13:19:09 +00:00

projectiles

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

2014-05-11 13:19:09 +00:00

reagents

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

2014-05-11 13:19:09 +00:00

recycling

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-10 01:40:11 +09:30

research

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

2014-05-03 16:56:19 +01:00

scripting

…

security levels

…

supermatter

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

2014-05-03 16:56:19 +01:00

surgery

…

virus2

…