Detective Google 6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches

2020-03-17 16:29:13 -05:00

..

admin

Merge pull request #11480 from Ghommie/Ghommie-cit623

2020-03-16 13:22:49 -07:00

antagonists

Merge pull request #11290 from Putnam3145/traitor-types

2020-03-15 01:35:30 -07:00

assembly

Porting datum components system updates.

2020-03-12 18:22:26 +01:00

atmospherics

WIP

2020-03-08 19:26:01 +01:00

awaymissions

Merge pull request #10327 from Seris02/tggenetics

2020-03-11 17:01:37 -07:00

bsql

…

buildmode

WIP

2020-03-08 19:26:01 +01:00

cargo

Update misc.dm

2020-03-13 14:20:28 -04:00

chatter

…

client

Merge pull request #11406 from kevinz000/minimaps

2020-03-12 14:18:39 +01:00

clothing

Merge remote-tracking branch 'upstream/master' into hudpatches

2020-03-17 16:29:13 -05:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #11429 from Putnam3145/dynamic-tweaks

2020-03-12 14:20:28 +01:00

fields

Fix runtimes some more.

2020-03-10 22:40:06 +01:00

flufftext

…

food_and_drinks

Update snacks_pie.dm

2020-03-15 16:16:28 +01:00

games

WIP

2020-03-08 19:26:01 +01:00

goonchat

…

holiday

…

holodeck

WIP

2020-03-08 19:26:01 +01:00

hydroponics

Merge pull request #11418 from Ghommie/Ghommie-cit615

2020-03-11 17:01:13 -07:00

integrated_electronics

Porting datum components system updates.

2020-03-12 18:22:26 +01:00

jobs

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

2020-03-09 16:49:32 +08:00

keybindings

…

language

…

library

WIP

2020-03-08 19:26:01 +01:00

lighting

…

mapping

Porting datum components system updates.

2020-03-12 18:22:26 +01:00

mining

a finger of the monkey's paw curls.

2020-03-16 01:35:47 -05:00

mob

Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5

2020-03-17 09:29:39 -07:00

modular_computers

Fixing some bug reports.

2020-03-14 02:34:25 +01:00

newscaster

Ok, done.

2020-03-08 22:51:36 +01:00

ninja

Shortcut fix for a sticky situation.

2020-03-16 01:23:12 +01:00

NTNet

…

oracle_ui

…

paperwork

Ok, done.

2020-03-08 22:51:36 +01:00

photography

Ok, done.

2020-03-08 22:51:36 +01:00

pool

Ok, done.

2020-03-08 22:51:36 +01:00

power

Merge pull request #11391 from Ghommie/Ghommie-cit612

2020-03-10 05:58:17 -07:00

procedural_mapping

…

projectiles

I LOVE YOU KITCHEN GUN!

2020-03-17 03:20:53 +11:00

reagents

Update reagent_containers.dm

2020-03-16 17:07:30 +01:00

recycling

Ok, done.

2020-03-08 22:51:36 +01:00

research

Merge pull request #11483 from Hatterhat/mining-borg-nerfs

2020-03-16 13:22:23 -07:00

ruins

…

security_levels

…

shuttle

Merge pull request #10702 from Ghommie/Ghommie-cit528

2020-03-10 17:24:48 -07:00

spells

Merge pull request #10327 from Seris02/tggenetics

2020-03-11 17:01:37 -07:00

station_goals

Ok, done.

2020-03-08 22:51:36 +01:00

surgery

More runtime errors.

2020-03-16 01:55:02 +01:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

I LOVE YOU KITCHEN GUN!

2020-03-17 03:20:53 +11:00

vehicles

Ok, done.

2020-03-08 22:51:36 +01:00

vending

…

vore

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610

2020-03-08 02:33:27 +01:00

VR

Ok, done.

2020-03-08 22:51:36 +01:00

zombie

…