Cyberboss 78ee754da3 Merge upstream

2017-04-01 23:38:37 -04:00

..

admin

Merge upstream

2017-04-01 23:38:37 -04:00

assembly

Merge upstream

2017-03-27 09:32:08 -04:00

atmospherics

Fixes atmospherics (#25770)

2017-04-01 17:51:01 -04:00

awaymissions

Merge upstream

2017-04-01 23:38:37 -04:00

cargo

Merge upstream

2017-04-01 23:38:37 -04:00

chatter

…

client

Merge upstream

2017-04-01 23:38:37 -04:00

clothing

Fixes snowflake drones (#25740)

2017-04-01 21:31:38 -03:00

crafting

Modular Receiver in Autolathe (#25401)

2017-03-25 09:21:50 +13:00

detectivework

…

emoji

…

error_handler

…

events

Merge upstream

2017-04-01 23:38:37 -04:00

flufftext

…

food_and_drinks

Merge upstream

2017-04-01 23:38:37 -04:00

games

…

holiday

Merge upstream

2017-03-27 09:32:08 -04:00

holodeck

Fixes grammar on objects landing and bouncing off rims (#25722)

2017-04-01 11:15:13 -04:00

html_interface

…

hydroponics

Minor runtimes fixes. (#25566)

2017-03-29 19:21:51 -03:00

jobs

Rename ticker to SSticker

2017-03-22 10:48:25 -04:00

library

Fixes some runtimes with soapstone messages

2017-03-22 20:06:09 +00:00

lighting

…

mapping

Merge branch 'master' into TiredOfTheInconsistency

2017-03-23 09:21:20 -04:00

mining

Merge upstream

2017-04-01 23:38:37 -04:00

mob

Merge upstream

2017-04-01 23:38:37 -04:00

modular_computers

Minor runtimes fixes. (#25566)

2017-03-29 19:21:51 -03:00

ninja

Merge upstream

2017-04-01 23:38:37 -04:00

orbit

…

paperwork

Merge upstream

2017-03-30 19:18:59 -04:00

power

Merge upstream

2017-04-01 23:38:37 -04:00

procedural_mapping

…

projectiles

Fixes some chameleon clothing not appearing in the list (#25551)

2017-03-31 08:24:21 +02:00

reagents

Merge upstream

2017-04-01 23:38:37 -04:00

recycling

Fixes grammar on objects landing and bouncing off rims (#25722)

2017-04-01 11:15:13 -04:00

research

Advanced cam fixes (#25601)

2017-03-30 08:38:16 -03:00

ruins

Cloth Golem Fix (#25617)

2017-03-30 16:11:36 -04:00

security_levels

…

shuttle

Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency

2017-03-24 16:34:20 -04:00

space_transition

…

spells

Fucking ticker

2017-03-23 14:12:45 -04:00

station_goals

SSevent -> SSevents

2017-03-22 11:26:01 -04:00

stock_market

…

surgery

Merge upstream

2017-03-30 19:18:59 -04:00

telesci

…

tgui

…

tooltip

…

uplink

Merge upstream

2017-03-30 19:18:59 -04:00

vehicles

Merge branch 'master' into TiredOfTheInconsistency

2017-03-23 09:21:20 -04:00

VR

…

zombie

Gives an icon to the zombie festering ooze (#25493)

2017-03-26 14:07:16 -03:00