Ccomp5950 9f3e58cfe9 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into say_code_fix ...

Conflicts:
	code/modules/mob/hear_say.dm

2014-04-22 18:25:03 -05:00

..

admin

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

2014-03-28 18:46:04 -05:00

assembly

…

awaymissions

…

client

Undershirts and rolling down jumpsuits!

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

clothing

Merge pull request #4705 from DJSnapshot/jumpsuits

2014-04-07 02:12:59 -05: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

A first pass at more realistic w_class values

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

…

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 github.com:Baystation12/Baystation12 into dev

2014-03-18 19:44:19 -05:00

mob

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

2014-04-22 18:25:03 -05:00

nano

…

organs

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

2014-03-28 18:46:04 -05:00

paperwork

Merge pull request #4715 from Iamgoofball/FUCKMONKEY

2014-04-11 11:47:37 -07:00

power

die monkey emergency DIE

2014-04-06 12:05:41 -07:00

projectiles

Fixed chameleon bullets being able to embed.

2014-04-13 19:21:49 -07:00

reagents

A first pass at more realistic w_class values

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

recycling

A first pass at more realistic w_class values

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

research

Merge pull request #4690 from Glloyd/ear_stuff_2

2014-04-05 16:23:59 +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

Changed supermatter messages to reflect what they actually mean.

2014-02-28 15:28:11 -08: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