Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

combat

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

equipment

replaced electrodes with insta hit taser beams.

2014-04-05 17:13:09 -07:00

medical

Medical HUDs will now only show brainworms if the worm is controlling the host.

2013-12-19 11:00:21 +10:30

working

ERT mecha beacons.

2013-10-12 14:31:12 +03:00

mech_bay.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

mech_fabricator.dm

Fixed the bug where mech fabricators would get stuck whenever the RnD console was not found.

2014-03-04 23:51:12 +01:00

mecha_construction_paths.dm

Fixes #3106

2013-06-21 06:43:24 -07:00

mecha_control_console.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

mecha_parts.dm

Smallfix.

2013-10-12 19:49:29 +03:00

mecha_wreckage.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

mecha.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00