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

Conflicts:
	icons/obj/items.dmi

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

..

admin

Changes all appropriate instances of toxins to phoron

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

assembly

Changes all appropriate instances of toxins to phoron

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

awaymissions

…

client

Undershirts and rolling down jumpsuits!

2014-04-05 16:18:11 -07:00

clothing

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

2014-04-16 21:44:26 -07:00

customitems

A first pass at more realistic w_class values

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

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

ext_scripts

Adds a C library alternative to the ircbot nudge script.

2014-03-04 10:08:17 +00: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 branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

mob

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

2014-04-16 22:13:48 -07:00

nano

NanoUI Caching and SMES tweaks

2014-01-12 20:07:48 +00:00

organs

Changes most viable, used entries of plasma with phoron.

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

paperwork

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

2014-04-16 22:13:48 -07:00

power

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

2014-04-16 22:13:48 -07:00

projectiles

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

2014-04-16 21:44:26 -07:00

reagents

Adjusted fuel spread

2014-04-17 21:19:05 -04:00

recycling

A first pass at more realistic w_class values

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

research

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

2014-04-16 21:44:26 -07: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

Changes all appropriate instances of toxins to phoron

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

surgery

Code effeciency project: HUD items rewrite

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

telesci

A first pass at more realistic w_class values

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

virus2

Code review and remove baystation12.int from source control.

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