Ccomp5950 6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	html/changelog.html

2014-04-04 01:14:31 -05:00

..

admin

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

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

assembly

Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.

2013-12-18 02:08:38 +08:00

awaymissions

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

client

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

2014-02-26 09:34:38 -06:00

clothing

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

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

customitems

Replaces modwho and adminwho with staffwho.

2014-01-10 12:49:32 -08:00

destilery

Reintroducing the dough-based cooking system.

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

detectivework

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

economy

Typo fix.

2014-02-22 06:54:11 +03: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

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

food

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

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

genetics

…

icon generation

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

library

medical manual

2014-02-16 02:29:20 +11:00

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

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

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

mob

I can feel the hugs already.

2014-03-30 00:49:23 -04:00

nano

NanoUI Caching and SMES tweaks

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

organs

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

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

paperwork

Also fixes paperbin without hands

2014-03-31 18:48:57 +03:00

power

APCs that are undersupplied now call cell.give()

2014-04-02 23:46:54 -04:00

projectiles

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

reagents

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

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

recycling

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

research

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

2014-04-04 01:14:31 -05: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

Because we HAVE to define Del() three times

2014-02-04 11:30:35 -08:00

virus2

Code review and remove baystation12.int from source control.

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