LetterJay 349b0f4f20 Update spray.dm

2017-12-19 17:19:05 -06:00

..

admin

Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578

2017-12-18 15:19:22 -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

Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050

2017-12-18 15:20:00 -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]Refactors reagent container types

2017-12-18 22:54:51 -06:00

detectivework

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

emoji

…

error_handler

…

events

Fixes race swap (#33566)

2017-12-17 04:11:40 -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

Update drinks.dm

2017-12-19 17:15:37 -06:00

games

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

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

goonchat

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -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

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

integrated_electronics

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

jobs

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

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

keybindings

Quick access hotkeys for backpack and belt

2017-12-17 04:10:20 -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

[READY]Refactors reagent container types

2017-12-18 22:54:51 -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

[READY]Refactors reagent container types

2017-12-18 22:54:51 -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

Update ammo_casings.dm

2017-12-19 15:29:45 -06:00

reagents

Update spray.dm

2017-12-19 17:19:05 -06:00

recycling

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

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

research

[READY]Refactors reagent container types

2017-12-18 22:54:51 -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

Update st_interface.dm

2017-12-18 15:24:23 -06:00

shuttle

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

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

space_transition

…

spells

Mi-go

2017-12-17 04:11:01 -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

…

tooltip

…

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

…

zombie

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

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