tkdrg 6f00a5d53f Merge pull request #15147 from KorPhaeron/control_point ...

Fixes king of the hill not resetting properly

2016-02-03 21:49:51 -03:00

..

admin

Merge pull request #15122 from JJRcop/bugfixmoji

2016-02-01 19:44:16 -03: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

Machines are apparently not anchored by default

2016-02-01 22:40:22 -06: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

…

detectivework

…

emoji

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

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

Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot

2016-02-02 19:04:20 -06:00

json

…

library

…

lighting

…

mining

Merge Conflict Fix

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

mob

Merge pull request #15136 from Incoming5643/nonhumanunlessprovenotherwise

2016-02-02 22:28:18 -06: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

…

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

Merge pull request #15074 from Chiefwaffles/Slipocalypse

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

vehicles

…