Cheridan 7e724a9f65 Merge pull request #3851 from Ikarrus/splat ...

Shuttles docking on you will really hurt

2014-07-01 23:29:05 -05:00

..

admin

Merge pull request #3851 from Ikarrus/splat

2014-07-01 23:29:05 -05:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

client

OKAY WHOOPS I LIED

2014-06-22 20:31:21 -04:00

clothing

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

detectivework

…

events

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

flufftext

…

food

Merge pull request #3718 from hornygranny/cheeseallthewaydown

2014-05-31 13:56:03 +02:00

hydroponics

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

2014-06-21 09:00:21 -04:00

library

carved books now turn into storage items

2014-05-16 14:30:04 -07:00

mining

One big update for stacks.

2014-06-10 20:36:08 +04:00

mob

Resolved Conflicts:

2014-07-01 13:02:40 -06:00

nano

…

paperwork

Fixed indentations.

2014-05-14 09:02:53 -06:00

power

Merge pull request #4008 from advomach/master

2014-06-27 19:43:55 -05:00

projectiles

Override emp_act on the ionrifle

2014-06-24 20:37:27 +12:00

reagents

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

recycling

The Loggening: Admin Edition

2014-06-02 23:13:33 -06:00

research

One big update for stacks.

2014-06-10 20:36:08 +04:00

scripting

…

security levels

…

shuttle

-Shuttles inflict heavy brute damage instead of instagibbing

2014-06-06 22:14:55 -06:00

surgery

Moved item_heal_robotic out of obj/item and into mob_helpers.dm

2014-06-05 19:25:08 -05:00

telesci

…