variableundefined e2f7b7e388 Deconflict once again

2018-10-21 10:18:15 +08:00

..

admin

Merge pull request #9842 from variableundefined/ListFreeSlotNoLie

2018-10-20 16:37:14 -07:00

alarm

…

antagonists

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

arcade

…

assembly

Voice analyzers no longer activate on any noise.

2018-10-13 07:50:05 +02:00

atmos_automation

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

awaymissions

Merge pull request #9719 from SamHPurp/smoothing-improvements

2018-10-21 07:41:47 +08:00

buildmode

Re-implements BM offsets in a 511-compatible manner

2018-10-16 20:10:03 -07:00

busy_space

…

client

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

clothing

Merge pull request #9888 from Fox-McCloud/spark-refactor

2018-10-19 08:41:03 +08:00

countdown

…

crafting

TG container_type refactor

2018-10-13 08:20:52 +08:00

customitems

Resolves conflicts.

2018-10-11 05:36:22 -05:00

detective_work

TG container_type refactor

2018-10-13 08:20:52 +08:00

economy

…

error_handler

…

events

Merge pull request #9888 from Fox-McCloud/spark-refactor

2018-10-19 08:41:03 +08:00

examine

fixies

2018-10-11 22:02:23 +01:00

ext_scripts

…

fancytitle

…

fish

Deconflict 1

2018-10-21 07:56:55 +08:00

flufftext

Resolves conflicts.

2018-10-11 05:36:22 -05:00

food_and_drinks

Deconflict 1

2018-10-21 07:56:55 +08:00

games

…

holiday

…

hydroponics

Deconflict 1

2018-10-21 07:56:55 +08:00

karma

…

library

…

lighting

…

logic

…

map_fluff

…

martial_arts

moves boxing attack logs to the ALL preference

2018-10-12 23:28:04 -04:00

mining

Merge pull request #9864 from variableundefined/ManualRevert

2018-10-19 19:16:00 -04:00

mob

Deconflict once again

2018-10-21 10:18:15 +08:00

modular_computers

Merge pull request #9662 from dapocalypse/PasswordProtectedFiles

2018-10-20 11:01:35 +08:00

nano

Resolves conflicts.

2018-10-11 05:36:22 -05:00

ninja

…

paperwork

Deconflict 1

2018-10-21 07:56:55 +08:00

pda

…

persistence

…

power

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

procedural_mapping

…

projectiles

Deconflict 1

2018-10-21 07:56:55 +08:00

reagents

Deconflict 1

2018-10-21 07:56:55 +08:00

recycling

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

research

Deconflict 1

2018-10-21 07:56:55 +08:00

response_team

adds nullrod to gamma paranormal

2018-10-12 15:41:06 +01:00

ruins

…

scripting

Keeps img functionality in chat while fixing the other exploit

2018-10-09 22:25:58 +01:00

security_levels

Resolves conflicts.

2018-10-11 05:36:22 -05:00

shuttle

Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements

2018-10-13 21:34:04 +01:00

space_management

…

spacepods

numbers round the wrong way

2018-10-20 11:05:53 +01:00

station_goals

Merge pull request #9814 from Agameofscones/DNA_sampler_QOL

2018-10-19 07:44:37 +08:00

store

…

surgery

removes mushroom changes

2018-10-20 16:34:24 -05:00

telesci

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

tooltip

…

tram

…

vehicle

WEEWOO FIX

2018-10-09 15:26:44 -04:00

vr

Resolves conflicts.

2018-10-11 05:36:22 -05:00