Ccomp5950 8d65f8a87a Merge pull request #7175 from atlantiscze/pewPEWPEWboom ...

[Ready To Merge] Emitter update

or how I might learn to love the revert button.

2014-12-16 21:17:54 -05:00

..

admin

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

2014-12-10 18:50:31 +10:30

assembly

Noise emotes

2014-12-07 12:09:02 +00:00

awaymissions

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

client

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

2014-12-14 00:27:16 +01:00

clothing

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

2014-12-15 08:58:28 +01:00

customitems

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

destilery

…

detectivework

…

economy

Fixes #7427.

2014-12-12 15:43:29 +01:00

events

Drastically reduces radiation storm duration.

2014-12-11 10:36:15 +01:00

ext_scripts

…

flufftext

…

food

Fixes pretzels being unmakable (use a poppy instead of the seeds)

2014-12-13 22:46:55 +10:30

games

…

genetics

…

hydroponics

Fixes a typo in the Hydroponics reagents

2014-12-13 14:59:56 -06:00

icon generation

…

library

…

liquid

…

maps

…

mining

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

2014-12-07 04:33:46 +01:00

mob

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

2014-12-15 08:58:28 +01:00

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

organs

Fixes #7406

2014-12-13 19:56:11 -05:00

paperwork

Morphic Clerical Kit

2014-12-12 10:07:42 +01:00

power

Merge resolution.

2014-12-13 23:10:46 +10:30

projectiles

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

2014-12-09 09:07:38 +01:00

reagents

Fixes colour mix up

2014-12-13 17:54:30 -05:00

recycling

Merge pull request #7347 from Baystation12/master

2014-12-10 03:21:56 +10:30

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features

2014-12-08 06:58:50 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge resolution.

2014-12-08 13:01:04 +10:30

supermatter

…

surgery

Fixes #7238

2014-12-07 11:52:29 +10:30

vehicles

…

virus2

…