variableundefined 152a350538 Deconflict

2018-10-19 16:07:04 +08:00

..

admin

Merge pull request #9363 from MarsM0nd/Refactor_UID

2018-10-19 07:46:42 +08:00

alarm

…

antagonists

Refactors Spark Spread Activation

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

arcade

Resolved merge conflicts... I hope.

2018-10-06 16:01:34 +01:00

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

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04: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

global lists global defined

2018-10-02 15:52:46 -05:00

crafting

global lists global defined

2018-10-02 15:52:46 -05:00

customitems

Resolves conflicts.

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

detective_work

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

economy

global lists global defined

2018-10-02 15:52:46 -05:00

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

Station name and no hashes

2018-10-05 17:36:28 +01:00

fancytitle

…

fish

Refactors Spark Spread Activation

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

flufftext

Resolves conflicts.

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

food_and_drinks

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

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

games

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

holiday

global lists global defined

2018-10-02 15:52:46 -05:00

hydroponics

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

karma

global lists global defined

2018-10-02 15:52:46 -05:00

library

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

lighting

dayum dats defined

2018-10-08 22:48:00 +01:00

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 #9888 from Fox-McCloud/spark-refactor

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

mob

Deconflict

2018-10-19 16:07:04 +08:00

modular_computers

Refactors Spark Spread Activation

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

nano

Resolves conflicts.

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

ninja

…

paperwork

Merge pull request #9363 from MarsM0nd/Refactor_UID

2018-10-19 07:46:42 +08:00

pda

refactors global lists.

2018-10-06 08:02:45 -05:00

persistence

…

power

Refactors Spark Spread Activation

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

procedural_mapping

…

projectiles

Refactors Spark Spread Activation

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

reagents

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

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

recycling

Merge branch 'master' into RelPath

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

research

Merge pull request #9732 from TDSSS/ody-stuff

2018-10-19 06:54:38 +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

Resolves conflicts.

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

space_management

…

spacepods

Merge pull request #9677 from DesolateG/global

2018-10-12 13:18:28 +08:00

station_goals

Merge pull request #9814 from Agameofscones/DNA_sampler_QOL

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

store

…

surgery

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04: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