TZK13 c0bfd10e49 Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

..

admin

Merge pull request #6425 from JJRcop/OOCemoji

2014-12-27 03:01:36 -03:00

assembly

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

awaymissions

Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser

2014-12-26 09:09:24 -08:00

client

More adjustments to the width and height of the preferences screen.

2014-12-23 07:08:58 -06:00

clothing

Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser

2014-12-27 02:59:24 -03:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

…

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #6387 from Incoming5643/goodbye_my_children

2014-12-26 16:29:36 -06:00

flufftext

…

food&drinks

Merge pull request #6498 from as334/MobReactions

2014-12-27 01:20:18 -06:00

holiday

…

hydroponics

Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs

2014-12-22 19:55:04 -08:00

library

Fixes monkeys being able to read books

2014-12-14 13:06:33 -05:00

mining

Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs

2014-12-22 19:55:04 -08:00

mob

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

nano

…

paperwork

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

power

Nerfs the supermatter explosion back to 3, 7, 14

2014-12-25 19:47:36 -03:00

projectiles

fixes a few bugs

2014-12-26 19:23:22 -08:00

reagents

Merge pull request #6498 from as334/MobReactions

2014-12-27 01:20:18 -06:00

recycling

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

research

Ports the rapid pipe dispenser (RPD) from /vg/

2014-12-25 22:06:39 -03:00

scripting

…

security levels

…

shuttle

…

surgery

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

telesci

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00