Fox McCloud 27cf06040d Merge pull request #7549 from Aurorablade/FloofyTail ...

Makes Jays old fluff tail public

2017-06-16 16:06:56 -04:00

..

admin

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

alarm

…

arcade

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

assembly

Adds movement intents

2017-06-10 10:12:14 +01:00

atmos_automation

…

awaymissions

…

client

ViewMods - Allows custom view ranges.

2017-06-07 19:39:33 -07:00

clothing

Additonal tweaks

2017-06-14 09:06:03 +01:00

countdown

…

crafting

Luxury Bluespace Capsule & More

2017-06-07 11:17:44 -07:00

customitems

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

detective_work

Merge pull request #7506 from FlattestGuitar/nice-gloves-whered-you-get-these

2017-06-09 17:44:19 -04:00

economy

…

error_handler

…

events

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

examine

…

ext_scripts

…

fancytitle

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

fish

Updates Intents

2017-06-10 09:43:36 +01:00

flufftext

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

food_and_drinks

Additonal tweaks

2017-06-14 09:06:03 +01:00

garbage_collection

…

holiday

…

hydroponics

Updates Intents

2017-06-10 09:43:36 +01:00

karma

…

library

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00

lighting

…

logic

…

martial_arts

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

mining

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

mob

Merge pull request #7549 from Aurorablade/FloofyTail

2017-06-16 16:06:56 -04:00

modular_computers

…

nano

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

ninja

Fixes typos and gender pronouns

2017-06-14 06:20:05 +01:00

paperwork

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

pda

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

persistence

…

power

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

reagents

Updates Intents

2017-06-10 09:43:36 +01:00

recycling

Updates Intents

2017-06-10 09:43:36 +01:00

research

Merge pull request #7501 from Fox-McCloud/illegal-implants

2017-06-09 14:49:38 -07:00

ruins

…

scripting

…

security_levels

…

shuttle

Merge branch 'master' into bad-karma

2017-06-10 19:16:13 +01:00

space_management

…

spacepods

Fixes more typos and missing full stops in descs...

2017-06-14 08:06:31 +01:00

station_goals

…

store

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

surgery

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

telesci

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

tooltip

…

tram

…

vehicle

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

vr

…