LetterJay 8ea38cfde2 Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681 ...

[MIRROR] Immovable rod abuse, smite and event trigger.

2017-12-21 04:55:32 -06:00

..

admin

Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681

2017-12-21 04:55:32 -06: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 branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

cargo

Defines math, take 2

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

chatter

…

client

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

clothing

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -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

Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681

2017-12-21 04:55:32 -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-33470

2017-12-21 03:24:03 -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-33470

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

integrated_electronics

Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -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 branch 'master' into upstream-merge-33470

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

modular_computers

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

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

ninja

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

NTNet

…

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 #4325 from Citadel-Station-13/upstream-merge-33246

2017-12-21 03:22:31 -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 #4473 from Citadel-Station-13/upstream-merge-33672

2017-12-21 04:55:16 -06:00

reagents

Merge branch 'master' into upstream-merge-33470

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

recycling

Merge branch 'master' into upstream-merge-33498

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

research

Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -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-33246

2017-12-20 00:27:06 -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

…

tgui

…

tooltip

…

uplink

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

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

vehicles

…

vore

…

VR

…

zombie

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

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