Nerd Lord af2e2da7cc correct arg and var names, ho

2016-02-03 18:01:38 -05:00

..

admin

Merge pull request #14698 from Firecage/absolutepathsandifs

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

assembly

Merge conflict fix

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

awaymissions

Merge pull request #14988 from KorPhaeron/ctf

2016-01-29 21:58:40 -03:00

client

Merge pull request #14963 from neersighted/flat

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

clothing

Merge pull request #14962 from Boredone/ReRadioactiveArmor

2016-01-30 00:27:13 -03:00

crafting

Some assembly requaired

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

detectivework

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

emoji

…

events

Merge Conflict Fix

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

flufftext

…

food&drinks

Merge Conflict Fix

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

games

Merge conflict fix

2016-01-17 19:15:30 +02:00

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

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

json

…

library

…

lighting

…

mining

Merge Conflict Fix

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

mob

Merge pull request #15042 from ChangelingRain/swarmoverlays

2016-01-30 18:39:56 +00: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

correct arg and var names, ho

2016-02-03 18:01:38 -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 #14996 from KorPhaeron/white_ship

2016-01-30 01:25:40 -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

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

uplink

Merge pull request #14948 from neersighted/uplink_fix

2016-01-28 03:09:09 +03:00

vehicles

…