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

Conflicts:
	code/modules/supermatter/supermatter.dm
	maps/tgstation2.dmm

2014-01-30 12:44:33 -06:00

..

admin

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

2014-01-30 12:14:44 -06: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

NanoUI assets are now sent to the client automatically.

2014-01-12 15:30:25 +00:00

clothing

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

2014-01-30 12:44:33 -06:00

customitems

Replaces modwho and adminwho with staffwho.

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

destilery

Openable soda cans and beer bottles!

2013-12-31 17:52:12 -08:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

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

economy

Small fixes, again

2014-01-04 21:26:28 +01:00

events

Various

2014-01-11 22:22:24 +01:00

ext_scripts

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

flufftext

Optimized and refactored list2text, text2list, and replacetext.

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

food

Roasted diona, for ZomgPonies/Paradise.

2014-01-10 00:26:23 +10:30

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Plasma glass stacking fix

2014-01-11 18:14:51 +13:00

mob

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

2014-01-30 12:44:33 -06:00

nano

NanoUI Caching and SMES tweaks

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

organs

IPC brain surgery code.

2014-01-29 16:01:25 +10:30

paperwork

Talisman icon fix

2014-01-10 17:09:01 -05:00

power

IPC feeding from APCs, IPC lack of reagent processing.

2014-01-29 15:37:08 +10:30

projectiles

Merge pull request #4342 from Zuhayr/ihategit

2014-01-25 20:24:49 -08:00

reagents

Merge pull request #4345 from RKF45/misc

2014-01-26 09:16:07 -08:00

recycling

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

research

Merge pull request #4270 from Baystation12/master

2014-01-11 18:18:03 -08:00

scripting

…

security levels

Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.

2013-11-07 16:02:57 -08:00

supermatter

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

2014-01-30 12:44:33 -06:00

surgery

IPC brain surgery code.

2014-01-29 16:01:25 +10:30

telesci

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

2013-12-13 19:13:43 +00:00

virus2

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00