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

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

admin

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

2014-02-20 19:16:23 -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

…

client

fix for semi-annoying typo.

2014-02-15 23:54:32 -08:00

clothing

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

2014-02-03 04:36:03 +03: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

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

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06: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

Diona roasts needs cooperation for acid

2014-02-01 11:16:55 +01:00

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Fix for unlocking exploit.

2014-02-09 13:34:40 +03:00

mob

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

2014-02-20 19:16:23 -06:00

nano

NanoUI Caching and SMES tweaks

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

organs

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

paperwork

Talisman icon fix

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

power

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

2014-02-20 19:16:23 -06:00

projectiles

Bullet inscriptions

2014-02-09 22:52:27 +13:00

reagents

Chem grenade fix

2014-02-14 15:44:45 +13: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

…

supermatter

Supermatter will stop processing when it's in space.

2014-02-15 17:20:54 -06:00

surgery

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

2014-02-03 04:36:03 +03:00

telesci

Because we HAVE to define Del() three times

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

virus2

DNA2 - A recode of DNA

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