Desolate f7627d2fcb Resolves conflicts.

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

..

admin

Resolves conflicts.

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

Resolves conflicts.

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

…

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 #9765 from Agameofscones/cupsnstuff

2018-10-11 03:24:29 +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

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

Adds the Air Traffic Control stuff from #7776

2018-09-22 16:09:17 +01:00

martial_arts

global lists global defined

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

mining

Resolves conflicts.

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

mob

Resolves conflicts.

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

Clean up some grabs

2018-09-16 12:28:39 -07:00

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

refactors global lists.

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

procedural_mapping

Fully refactors Chairs, Stools & Beds. Adds a few fun bits

2018-09-14 18:40:42 +01:00

projectiles

Resolves conflicts.

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

reagents

Resolves conflicts.

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

recycling

Resolves conflicts.

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

research

Resolves conflicts.

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

response_team

Resolves conflicts.

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

global lists global defined

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

station_goals

refactors global lists.

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

store

…

surgery

Resolves conflicts.

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

telesci

refactors global lists.

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

tooltip

…

tram

Fully refactors Chairs, Stools & Beds. Adds a few fun bits

2018-09-14 18:40:42 +01:00

vehicle

WEEWOO FIX

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

vr

Resolves conflicts.

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