Fermi 7a66039f0c Fixing merge errors. ...

Testmerge ready.

2019-06-14 21:55:17 +01:00

..

admin

Merge pull request #8547 from Ghommie/Ghommie-cit29

2019-06-08 01:22:16 -07:00

antagonists

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

assembly

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

atmospherics

Merge branch 'master' into fuckatmos

2019-06-07 04:38:47 -04:00

awaymissions

…

bsql

…

buildmode

untested lmao

2018-12-02 19:47:38 -06:00

cargo

Merge pull request #8549 from Trilbyspaceclone/patch-168

2019-06-08 01:23:31 -07:00

chatter

…

client

Enough clowning around.

2019-06-07 03:22:26 +02:00

clothing

Coloring gloves? Not on my watch!

2019-06-10 05:20:54 -04:00

crafting

Merge pull request #8549 from Trilbyspaceclone/patch-168

2019-06-08 01:23:31 -07:00

detectivework

Updates reagents a bit.

2019-06-07 06:27:04 +02:00

emoji

…

error_handler

Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time

2019-04-02 01:11:29 -04:00

events

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

fields

module things, jfc

2018-09-11 07:51:01 -05:00

flufftext

…

food_and_drinks

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

games

…

goonchat

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

holiday

…

holodeck

…

hydroponics

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

integrated_electronics

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

jobs

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

keybindings

module things, jfc

2018-09-11 07:51:01 -05:00

language

Slimespeak!

2019-05-24 08:48:03 -04:00

library

module things, jfc

2018-09-11 07:51:01 -05:00

lighting

…

mapping

…

mining

Merge pull request #8547 from Ghommie/Ghommie-cit29

2019-06-08 01:22:16 -07:00

mob

Fixing merge errors.

2019-06-14 21:55:17 +01:00

modular_computers

further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list

2019-04-14 16:40:37 -04:00

ninja

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

NTNet

…

orbit

module things, jfc

2018-09-11 07:51:01 -05:00

paperwork

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

photography

should be ready.

2019-06-06 19:24:20 +02:00

power

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

procedural_mapping

Merge branch 'master' into changelog-memes

2018-09-11 07:52:59 -05:00

projectiles

Merge pull request #8558 from Ghommie/Ghommie-cit35

2019-06-08 01:26:28 -07:00

reagents

Fixing merge errors.

2019-06-14 21:55:17 +01:00

recycling

…

research

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

ruins

…

security_levels

Adds a new security level: Amber (#7976)

2019-02-05 17:53:58 -08:00

shuttle

Fixes and updates pod's emergency suits storage.

2019-06-02 18:28:30 +02:00

spells

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

station_goals

should be ready.

2019-06-06 19:24:20 +02:00

surgery

Fixing merge errors.

2019-06-14 21:55:17 +01:00

tgs

…

tgui

Flashy flash and Gondola Pods

2018-09-21 02:48:17 -05:00

tooltip

…

unit_tests

…

uplink

Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00

vehicles

…

vending

Fixes.

2019-05-27 20:25:57 +01:00

VR

…

zombie

…