LetterJay bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 ...

[MIRROR] All-In-One grinder results are now defined by type, not by huge lists

2017-12-17 21:26:08 -06:00

..

admin

Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513

2017-12-17 21:24:24 -06:00

assembly

Update shock_kit.dm

2017-12-17 17:38:17 -06:00

atmospherics

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

awaymissions

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

cargo

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

chatter

…

client

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

clothing

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

crafting

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

detectivework

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

emoji

…

error_handler

…

events

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

fields

…

flufftext

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

food_and_drinks

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

games

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

goonchat

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

holiday

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

holodeck

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

html_interface

…

hydroponics

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

integrated_electronics

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

jobs

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

language

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

library

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

lighting

Player Z-tracking, again

2017-12-14 17:35:35 -06:00

mapping

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mentor

…

mining

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

mob

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

modular_computers

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

ninja

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

NTNet

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

orbit

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

paperwork

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

power

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

procedural_mapping

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

projectiles

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

reagents

Update pill.dm

2017-12-17 17:38:51 -06:00

recycling

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

research

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

ruins

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

security_levels

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

server_tools

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

shuttle

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

space_transition

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

spells

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

station_goals

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

stock_market

…

surgery

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

telesci

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

tgui

Brain Traumas

2017-12-06 12:05:20 -06:00

tooltip

Merge pull request #33396 from AnturK/tooltip-fix

2017-12-10 10:26:44 -06:00

uplink

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

vehicles

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

vore

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

VR

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

zombie

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00