Zuhayr 32d799e53e Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

..

admin

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

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

assembly

…

awaymissions

Fixes lab coat without icon.

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

client

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

clothing

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

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

Mining items path formatting

2014-12-18 04:58:40 +01:00

mob

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

nano

…

organs

Fixes #7406

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

paperwork

Morphic Clerical Kit

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

power

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

projectiles

Decreased fire delay on the unobtainable pulse funguns.

2014-12-18 03:13:04 +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

Weapon type design datums will now get proper description.

2014-12-18 05:28:41 +01:00

scripting

…

security levels

…

shieldgen

Moves all circuitboards to their respective files.

2014-12-17 14:31:21 +01:00

shuttles

Corrects names of computers, code formatting, updated computer descriptions.

2014-12-14 05:00:38 +01:00

supermatter

…

surgery

…

vehicles

…

virus2

…