Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

..

admin

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

alarm

…

arcade

Fixes up battle terminal connections

2016-12-30 00:12:02 -05:00

assembly

…

atmos_automation

…

awaymissions

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

client

Reduced redundancy.

2017-01-18 19:39:49 -05:00

clothing

Botany Rework

2017-01-21 18:28:03 -05:00

computer3

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

countdown

…

crafting

even more work

2017-01-22 08:11:31 -05:00

customitems

Adds a fluff item for ComputerlessCitizen

2017-01-10 14:31:27 +01:00

detective_work

…

economy

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

error_handler

…

events

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

garbage_collection

....Well i fixed IKEA shuttles anyway....

2016-12-05 22:07:54 -05:00

holiday

…

hydroponics

more fixes

2017-01-23 00:53:44 -05:00

karma

Switching karma back to the "OOC" tab

2016-12-07 16:52:10 +01:00

library

Makes new book sprites available for Bookbinder

2017-01-16 19:43:14 +01:00

lighting

…

logic

…

martial_arts

…

mining

Botany Rework

2017-01-21 18:28:03 -05:00

mob

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

nano

Fixes both pai resting jankiness, pai body re-entering

2017-01-09 15:14:26 -08:00

ninja

…

paperwork

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

pda

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

persistence

…

pooling

…

power

more fixes

2017-01-23 00:53:44 -05:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

reagents

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

recycling

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

research

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

shuttle

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

space_management

…

spacepods

Switches over to the new system

2017-01-17 13:57:07 +01:00

store

…

surgery

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

telesci

…

tooltip

…

tram

Switches over to the new system

2017-01-17 13:57:07 +01:00

vehicle

…