Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

2014-05-31 00:17:56 +01:00

..

combat

Cleaned the fuck out of smoke.

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

equipment

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -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

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +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

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07: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