Purpose 63dfd411aa Resolved merge conflicts... I hope.

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

..

admin

Merge pull request #9419 from Birdtalon/ticketrefactor

2018-10-01 16:20:46 +08:00

alarm

…

antagonists

…

arcade

Resolved merge conflicts... I hope.

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

assembly

…

atmos_automation

…

awaymissions

Port of TG ghost role spawner and Corpse Landmark refactor (#8211)

2018-10-03 11:31:55 +08:00

busy_space

…

client

Merge branch 'master' into Refactors-beds-stools-chairs

2018-09-29 15:36:27 +01:00

clothing

Merge pull request #9646 from Kurgis/Chief-Engineer-Jumpsuit-InHands

2018-10-01 21:53:28 +08:00

countdown

…

crafting

…

customitems

Resolved merge conflicts... I hope.

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

detective_work

Fixes a bunch of shown messages

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

economy

…

error_handler

…

events

…

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

Merge pull request #9400 from Tails2091/Hallucination-Refactor

2018-09-28 09:10:46 +08:00

food_and_drinks

Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled

2018-09-27 21:47:04 +08:00

games

Fixes a bunch of shown messages

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

holiday

…

hydroponics

Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled

2018-09-27 21:47:04 +08:00

karma

Squashed Query Error Logging To Single Proc

2018-09-28 15:49:30 -04:00

library

Fixes a bunch of shown messages

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

lighting

…

logic

…

map_fluff

…

martial_arts

…

mining

Resolved merge conflicts... I hope.

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

mob

Resolved merge conflicts... I hope.

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

modular_computers

Merge pull request #9476 from variableundefined/SSNanoMob

2018-10-01 01:13:58 -07:00

nano

Fixes a bunch of shown messages

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

ninja

…

paperwork

Fixes a bunch of shown messages

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

pda

Merge pull request #9476 from variableundefined/SSNanoMob

2018-10-01 01:13:58 -07:00

persistence

…

power

Merge pull request #9477 from variableundefined/SSPortShuttle

2018-10-01 01:13:42 -07:00

procedural_mapping

…

projectiles

Fixes a bunch of shown messages

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

reagents

Fixes a bunch of shown messages

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

recycling

Merge pull request #9616 from farie82/Disposals-Pipe-Fix

2018-10-01 16:21:11 +08:00

research

Fixed data management screen, research deletion.

2018-09-30 15:13:05 +02:00

ruins

…

scripting

…

security_levels

Merge pull request #9477 from variableundefined/SSPortShuttle

2018-10-01 01:13:42 -07:00

shuttle

…

space_management

…

spacepods

…

station_goals

Merge pull request #9477 from variableundefined/SSPortShuttle

2018-10-01 01:13:42 -07:00

store

…

surgery

Resolved merge conflicts... I hope.

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

telesci

makes you able to break down bluespace polycrystals in space§

2018-10-01 09:57:09 +02:00

tooltip

…

tram

…

vehicle

Merge branch 'master' into Refactors-beds-stools-chairs

2018-09-29 15:36:27 +01:00

vr

…