tkdrg 5e00afd4cc Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF ...

Adds the ability to store knives/pens/edaggers in certain shoes

2016-01-31 22:00:43 -03:00

..

admin

Merge pull request #14944 from tkdrg/agoodideaforonce

2016-01-31 19:58:24 +00:00

assembly

Merge conflict fix

2016-01-27 17:38:42 +02:00

atmospherics

Take to of grouping the atmos files in modules.

2016-01-30 21:09:38 +02:00

awaymissions

Merge pull request #15079 from KorPhaeron/ctf_bugfix

2016-01-31 21:23:52 -03:00

client

Merge pull request #14963 from neersighted/flat

2016-01-29 21:23:11 +03:00

clothing

Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF

2016-01-31 22:00:43 -03:00

crafting

Some assembly requaired

2016-01-26 02:43:08 +03:00

detectivework

…

emoji

…

events

Merge pull request #14103 from bgobandit/valentinestuff

2016-01-31 18:49:28 -03:00

flufftext

…

food&drinks

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

games

…

holiday

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

holodeck

Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj

2016-01-30 19:45:45 +00:00

html_interface

…

hydroponics

Removes wheat-to-rice mutation

2016-01-30 02:09:56 +00:00

json

…

library

…

lighting

…

mining

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

mob

Merge pull request #15031 from Fayrik/riseofthemachines

2016-01-31 19:02:52 -03:00

ninja

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

paperwork

Merge pull request #14698 from Firecage/absolutepathsandifs

2016-01-29 03:15:12 +03:00

power

Merge pull request #14999 from KorPhaeron/AI_buffs

2016-01-30 10:50:05 -03:00

procedural mapping

…

projectiles

Refactor's gun firing.

2016-01-29 22:16:35 -07:00

reagents

Fixes Super Obscure Spray Tan Bugs

2016-01-30 01:28:21 -05:00

recycling

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

research

Merge pull request #14888 from KorPhaeron/RED_UNZ_GO_FASTA

2016-01-28 20:38:15 -03:00

ruins

…

security levels

Rewrite SSUs, tweak newly added UIs

2016-01-25 12:03:07 -06:00

shuttle

Merge pull request #15034 from AnturK/shuttle_templates

2016-01-31 13:33:30 -03:00

space transition

…

surgery

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

telesci

…

tgui

Merge pull request #15030 from neersighted/tkui

2016-01-30 08:02:33 -03:00

tooltip

…

uplink

removes fungal tb from traitor

2016-01-29 00:59:22 +00:00

vehicles

…