Mloc-Argent e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

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

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

..

admin

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

2014-05-03 16:56:19 +01: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-03 16:56:19 +01:00

clothing

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

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

customitems

Initial commit for Kaine's custom items.

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

destilery

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

detectivework

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04: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

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2014-03-28 18:48:05 -05:00

genetics

…

icon generation

…

library

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

liquid

…

maps

…

mining

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

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

mob

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

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

nano

…

organs

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

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

paperwork

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

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

power

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

projectiles

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

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

reagents

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

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

recycling

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

research

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

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

scripting

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

security levels

Configuration option: Ability to set ERT to be admin call only.

2014-03-02 06:20:26 -06:00

supermatter

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

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

surgery

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

virus2

Code review and remove baystation12.int from source control.

2014-03-25 22:17:02 -05:00