Mark Mak ae0f6b28bd Merge pull request #9832 from Ty-Omaha/boxing-logs ...

Moves Boxing logs to the ALL preference

2018-10-13 11:41:32 +08:00

..

admin

oops

2018-10-11 16:26:06 -05:00

alarm

…

antagonists

…

arcade

Resolved merge conflicts... I hope.

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

assembly

First big chunk of the refactor

2018-10-07 17:52:04 -07:00

atmos_automation

global lists global defined

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

awaymissions

Merge pull request #9677 from DesolateG/global

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

buildmode

Resolves conflicts.

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

busy_space

…

client

Resolves conflicts.

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

clothing

Resolves conflicts.

2018-10-11 05:36:22 -05: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

Resolves conflicts.

2018-10-11 05:36:22 -05: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

…

flufftext

Resolves conflicts.

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

food_and_drinks

Merge pull request #9343 from variableundefined/OreTGPort

2018-10-11 19:34:13 -07: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

global lists global defined

2018-10-02 15:52:46 -05: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 #9677 from DesolateG/global

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

mob

Merge pull request #9521 from alex-gh/damage_mod_fix

2018-10-13 11:32:11 +08:00

modular_computers

refactors global lists.

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

nano

Resolves conflicts.

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

ninja

…

paperwork

global lists global defined

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

pda

refactors global lists.

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

persistence

…

power

Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes

2018-10-12 13:48:02 +08:00

procedural_mapping

…

projectiles

Merge pull request #9677 from DesolateG/global

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

reagents

Merge pull request #9830 from Birdtalon/chem

2018-10-13 09:02:25 +08:00

recycling

Resolves conflicts.

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

research

Merge pull request #9677 from DesolateG/global

2018-10-12 13:18:28 +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 #9677 from DesolateG/global

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

store

…

surgery

Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes

2018-10-12 13:48:02 +08:00

telesci

Merge pull request #9677 from DesolateG/global

2018-10-12 13:18:28 +08: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