comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

2013-08-04 01:40:32 +04:00

..

combat

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

equipment

Fixes Gravitational Catapult not detaching.

2013-07-30 20:06:37 +01:00

medical

Updated HUDs to find only known viruses.

2013-07-09 13:04:05 +04:00

working

Fixes #3131

2013-06-22 22:19:52 -07: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

Fix for #3345.

2013-07-25 03:03:14 +03: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

Runtime fixes for building computers with mech boards or an AI core circuit. I changed their board_type to "other" instead of the default one, "computer"

2013-01-18 22:10:36 +00: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

Redundancy fix.

2013-07-01 19:51:03 -07:00