phil235 359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring ...

Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm

2015-07-14 01:20:37 +02:00

..

admin

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

2015-07-14 01:20:37 +02:00

assembly

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

Removes topic limiter.

2015-07-11 23:09:04 -07:00

clothing

Merge pull request #10512 from duncathan/traygoggles

2015-07-12 12:41:37 +02:00

crafting

Merge pull request #10389 from Razharas/PinFix

2015-07-06 00:31:43 +01:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Fixes The clogged vent event making smoke spawn on welded scrubbers.

2015-07-09 20:28:28 +02:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

Attack logging tweaks

2015-07-08 23:14:37 -07:00

games

Merge pull request #10244 from Ikarrus/workplacesafety

2015-07-03 05:05:36 +03:00

holiday

Adds a category for food items, adds some missing weapons and a Misc category

2015-06-25 11:58:42 +01:00

html_interface

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

hydroponics

Attack logging tweaks

2015-07-08 23:14:37 -07:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

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

2015-07-14 01:20:37 +02:00

mob

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

2015-07-14 01:20:37 +02:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Update and Changelog

2015-07-05 22:20:00 -06:00

paperwork

Attack logging tweaks

2015-07-08 23:14:37 -07:00

power

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

2015-07-14 01:20:37 +02:00

procedural mapping

Repath grass.

2015-07-08 02:06:14 +01:00

projectiles

Merge pull request #10503 from phil235/RevolverMisfireFix

2015-07-11 19:01:04 -05:00

reagents

Merge pull request #10504 from optimumtact/sanitycheques

2015-07-12 22:11:35 -05:00

recycling

Added sanity check to disposal climbing

2015-06-30 15:45:48 +02:00

research

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

2015-07-14 01:20:37 +02:00

scripting

Fix for request console emergency runtime

2015-07-07 11:02:44 -05:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

Modified detective revolver isn't deleted anymore when it misfires.

2015-07-10 00:18:35 +02:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00