GS13NG

admin

Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599

2017-12-21 03:29:13 +00:00

assembly

Update shock_kit.dm

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

atmospherics

Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636

2017-12-21 03:44:57 +00:00

awaymissions

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

2017-12-18 15:20:00 -06:00

cargo

Defines math, take 2

2017-12-17 10:02:43 -06:00

chatter

…

client

Update client_procs.dm

2017-12-17 15:57:57 -06:00

clothing

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

crafting

…

detectivework

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

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

emoji

…

error_handler

…

events

Update operative.dm

2017-12-19 19:35:41 -06:00

fields

…

flufftext

[Ready]Brain Trauma additions

2017-12-17 11:11:10 -06:00

food_and_drinks

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

games

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

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

goonchat

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -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 branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

integrated_electronics

Merge pull request #33703 from kevinz000/patch-407

2017-12-21 00:46:48 -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

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

library

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

lighting

Defines math, take 2

2017-12-17 10:02:43 -06:00

mapping

Defines math, take 2

2017-12-17 10:02:43 -06:00

mentor

…

mining

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

mob

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00: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 #33622 from duncathan/assert_gas

2017-12-20 00:14:13 -06:00

procedural_mapping

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

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

projectiles

Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears

2017-12-20 00:14:28 -06:00

reagents

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

recycling

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

research

Fixes grammer issue (#33679 )

2017-12-20 12:02:25 -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 branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

space_transition

…

spells

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -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 #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00: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