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

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

admin

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

2016-04-03 18:22:20 -06:00

assembly

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

2016-03-29 14:46:06 -06:00

atmospherics

fixes huge roundstart bugs

2016-03-30 16:07:35 -06:00

awaymissions

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

cargo

Fixes and standardizes spelling

2016-03-30 04:14:07 -04:00

client

Merge pull request #16348 from Shadowlight213/adminsoundvolume

2016-03-31 11:59:52 -06:00

clothing

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

2016-04-03 18:22:20 -06:00

crafting

Adds sandbags

2016-04-02 23:52:12 -04:00

detectivework

…

emoji

…

events

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

2016-04-03 18:22:20 -06:00

flufftext

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

2016-03-29 14:46:06 -06:00

food&drinks

Adds Techno's absinthe to mining

2016-04-02 23:48:24 -04:00

games

…

holiday

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

holodeck

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

html_interface

…

hydroponics

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

2016-04-03 18:22:20 -06:00

jobs

Merge pull request #16439 from KorPhaeron/mecha2

2016-03-31 22:10:07 -04:00

library

…

lighting

fixes huge roundstart bugs

2016-03-30 16:07:35 -06:00

mining

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

2016-04-03 18:22:20 -06:00

mob

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

2016-04-03 18:22:20 -06:00

ninja

…

paperwork

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

power

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

procedural mapping

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

projectiles

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

2016-04-03 18:22:20 -06:00

reagents

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

2016-04-03 18:22:20 -06:00

recycling

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

2016-03-30 22:55:00 -06:00

research

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

2016-04-03 18:22:20 -06:00

ruins

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

2016-04-03 18:22:20 -06:00

security levels

…

shuttle

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

space transition

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

spells

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

stock_market

You must be 18 or older to play

2016-03-27 22:21:34 -04:00

surgery

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

2016-03-29 14:46:06 -06:00

telesci

…

tgui

…

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

Merge pull request #16260 from Bawhoppen/grenadesholyshithelp

2016-03-22 19:35:43 +01:00

vehicles

Merge pull request #16375 from ChangelingRain/fastbike

2016-03-26 20:46:35 -05:00