xxalpha 346c698162 conflict fix ...

FORWARD SLASH

2016-01-19 23:06:23 +00:00

..

admin

safepick

2016-01-18 05:46:44 +00:00

assembly

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

awaymissions

Tidy tooltips; hide lock button from non-lockable uplinks

2016-01-18 14:27:34 -06:00

client

…

clothing

Merge pull request #14706 from xxalpha/straightouttajacket

2016-01-19 07:24:51 -06:00

crafting

…

detectivework

…

emoji

…

events

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

2016-01-19 14:38:26 +00:00

flufftext

Repath canisters; make label code create a new can; use es6 function shorthand

2016-01-16 12:13:51 -06:00

food&drinks

Broken bottles are now the same size as unbroken bottles.

2016-01-15 22:14:18 -05:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

…

json

…

library

…

lighting

…

mining

Delete the crate instead of doing nothing

2016-01-18 12:32:31 +03:00

mob

conflict fix

2016-01-19 23:06:23 +00:00

ninja

…

paperwork

…

power

Hotfix for display issues and UIs droping ui_act calls

2016-01-18 17:00:15 -06:00

procedural mapping

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

projectiles

Fixes firing_pin not qdeling.

2016-01-17 16:06:36 +01:00

reagents

Hotfix for display issues and UIs droping ui_act calls

2016-01-18 17:00:15 -06:00

recycling

…

research

tgui atmos control computers

2016-01-18 14:21:57 -06:00

ruins

…

security levels

…

shuttle

Adds a variable to block shuttles from changing destinations midflight for mining shuttle

2016-01-09 17:44:16 +01:00

space transition

…

surgery

…

telesci

…

tgui

Hotfix for display issues and UIs droping ui_act calls

2016-01-18 17:00:15 -06:00

tooltip

…

vehicles

…