Gwydion Brain 57debc2eb8 Merge branch 'master' into thatdanguy23_fluff_t2

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

..

admin

Merge pull request #9631 from Birdtalon/ERT-changes

2018-10-09 08:58:15 +08: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

…

awaymissions

dayum dats defined

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

buildmode

Refactors buildmode into submodules, and adds an "atmos" buildmode

2018-10-07 20:54:40 -07:00

busy_space

…

client

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

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

clothing

Merge pull request #9785 from lass9030/match-fix

2018-10-10 07:55:11 +08:00

countdown

…

crafting

…

customitems

Merge branch 'master' into thatdanguy23_fluff_t2

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

detective_work

Fixes a bunch of shown messages

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

economy

updates vars to use the defines

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

error_handler

…

events

fixes runtime in sentience.dm

2018-10-09 00:07:51 -04:00

examine

…

ext_scripts

Station name and no hashes

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

fancytitle

…

fish

…

flufftext

First big chunk of the refactor

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

food_and_drinks

SSOverlays & Hover Inventory Indicator

2018-10-08 22:50:39 -07: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

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

Clean up some grabs

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

mining

Merge pull request #9716 from SamHPurp/smooth-plating

2018-10-09 10:25:34 +08:00

mob

Merge pull request #9804 from Birdtalon/tpbug

2018-10-11 01:44:11 +08:00

modular_computers

Merge pull request #9476 from variableundefined/SSNanoMob

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

nano

Merge branch 'master' into ERT-changes

2018-09-30 14:53:32 +01:00

ninja

Clean up some grabs

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

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

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

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

projectiles

Merge pull request #9631 from Birdtalon/ERT-changes

2018-10-09 08:58:15 +08:00

reagents

Merge pull request #9747 from SamHPurp/runtime-cheating

2018-10-09 08:27:04 +08:00

recycling

Adds some more description and adds a specific layer for conveyors

2018-10-08 20:38:49 +01:00

research

dayum dats defined

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

response_team

fixes broken type-path and duplicated helmet sprites

2018-10-08 09:24:24 +01:00

ruins

…

scripting

Keeps img functionality in chat while fixing the other exploit

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

security_levels

Merge branch 'master' into ERT-changes

2018-10-07 19:22:10 +01:00

shuttle

Merge pull request #9772 from SamHPurp/mouse-opacity-define

2018-10-09 08:25:55 +08:00

space_management

…

spacepods

…

station_goals

Merge pull request #9477 from variableundefined/SSPortShuttle

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

store

…

surgery

Merge pull request #9631 from Birdtalon/ERT-changes

2018-10-09 08:58:15 +08:00

telesci

makes you able to break down bluespace polycrystals in space§

2018-10-01 09:57:09 +02: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

First big chunk of the refactor

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