Tigercat2000 85d4f59caf Wow. Soft merge conflicts, in a way. Merging not causing a git error, but ...

instead, a compile error. Congrats TRAVIS, you are smarter than your
average CI.

2015-12-04 22:32:38 -08:00

..

admin

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

2015-12-03 11:03:01 -08:00

alarm

…

assembly

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

atmos_automation

…

awaymissions

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

client

The non-Vox are taking all the Vox socks!

2015-11-29 18:58:00 -05:00

clothing

Lots of cool fixes! Read below!

2015-12-03 23:46:10 -08:00

computer3

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

2015-12-03 11:03:01 -08:00

crafting

…

customitems

…

destilery

…

detective_work

…

economy

added cancel to more powers, hand tele, cleanups to others

2015-11-30 22:30:57 -05:00

events

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

examine

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

2015-11-24 18:05:01 -05:00

ext_scripts

…

fish

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

flufftext

…

food

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

games

…

garbage_collection

…

holiday

…

hydroponics

Botany QoL Changes

2015-11-30 20:03:59 -05:00

jungle

…

karma

…

library

…

lighting

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

liquid

…

media

…

mining

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

2015-12-04 22:29:29 -08:00

mob

Wow. Soft merge conflicts, in a way. Merging not causing a git error, but

2015-12-04 22:32:38 -08:00

nano

fixed nanoui maps positioning stuff wrong, atmos control having any items

2015-11-29 17:50:17 -05:00

ninja

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

organs

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

paperwork

made AI tracking cancel-able, fixed folder labelling

2015-11-30 01:06:21 -05:00

pooling

…

power

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

2015-12-03 11:03:01 -08:00

procedural_mapping

…

projectiles

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

reagents

Merge pull request #2701 from Fox-McCloud/phlog-tweak

2015-12-02 19:15:12 -05:00

recycling

…

research

Adds in Aloe Vera and Comfrey

2015-11-25 01:37:58 -05:00

scripting

…

security_levels

…

shieldgen

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

shuttle

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

shuttles

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

space_transition

…

store

…

surgery

…

telesci

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

tram

…

vehicle

…

virus2

…