Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

appendix.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

bones.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

braincore.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

eye.dm

Changed way substitute tools are handled.

2013-05-28 18:16:11 +04:00

face.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

generic.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

headreattach.dm

Small fix for head reattachment surgery.

2013-10-30 17:20:18 -04:00

implant.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

other.dm

Fix-O-Vein steps bugfix.

2013-06-12 14:00:48 +03:00

ribcage.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

robolimbs.dm

Surgery grammar fixes

2013-11-10 13:08:44 -06:00

surgery.dm

Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.

2013-06-05 17:35:38 +09:30