MrSnapwalk 789134d8f2 Automerge fix ...

Fixing the conflicts preventing an automerge.

2014-03-02 17:03:35 -06:00

..

admin

Removed group_multiplier nonsense from gas_mixture.

2014-02-28 18:12:33 -05:00

assembly

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

awaymissions

Removes the away mission box2550

2014-02-20 12:47:08 -05:00

client

adds a small check to see if the job controller started up before using buttons related to it and generate runtimes.

2014-02-14 02:37:31 -03:00

clothing

Automerge fix

2014-03-02 17:03:35 -06:00

detectivework

You can now properly clean your hands of blood. Fixes #2258.

2014-01-22 17:42:36 +00:00

events

Fixed misc complaints about NODROP

2014-02-18 18:17:55 +01:00

flufftext

missing exclamation points

2014-02-20 12:41:23 -08:00

food

By sticking a crayon in the mix when making a burger you can now make a colored burger!

2014-02-23 18:34:32 -05:00

hydroponics

haha oops thanks travis

2014-02-25 23:25:30 -06:00

library

Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.

2014-02-20 17:47:33 +00:00

mining

added coords to server log

2014-02-21 11:31:34 -08:00

mob

Merge pull request #2927 from AlexanderUlanH/alium

2014-03-02 13:41:37 -08:00

nano

NanoUI Update

2014-01-09 01:02:13 +00:00

paperwork

Merge pull request #2826 from YotaXP/polaroid-fix

2014-02-20 16:22:59 -08:00

power

Remove name checks

2014-02-19 17:23:57 -05:00

projectiles

Merge pull request #2924 from TZK13/Shotgun-Shells

2014-03-02 13:39:50 -08:00

reagents

Merge pull request #2891 from RobRichards1997/23/02/2014-BurnBabyBurnFueltankInferno

2014-03-02 14:19:44 -08:00

recycling

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

research

Conflicts:

2014-02-25 01:26:05 +04:00

scripting

…

security levels

…

shuttle

* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.

2013-12-20 22:09:06 +00:00

surgery

second pass

2014-02-15 20:11:12 -08:00

telesci

Telescience fix

2014-02-23 16:54:52 +04:00